Deleted
Added
java.py (1657:0821c0c05a9f) | java.py (1670:099c23b00eaf) |
---|---|
1import glob 2import os 3import shutil 4import subprocess 5 6import pytest 7from conftest import option 8from unit.applications.proto import TestApplicationProto 9 10 11class TestApplicationJava(TestApplicationProto): | 1import glob 2import os 3import shutil 4import subprocess 5 6import pytest 7from conftest import option 8from unit.applications.proto import TestApplicationProto 9 10 11class TestApplicationJava(TestApplicationProto): |
12 application_type = "java" 13 |
|
12 def prepare_env(self, script): 13 app_path = option.temp_dir + '/java' 14 web_inf_path = app_path + '/WEB-INF/' 15 classes_path = web_inf_path + 'classes/' 16 script_path = option.test_dir + '/java/' + script + '/' 17 18 if not os.path.isdir(app_path): 19 os.makedirs(app_path) --- 59 unchanged lines hidden (view full) --- 79 self.prepare_env(script) 80 81 self._load_conf( 82 { 83 "listeners": {"*:7080": {"pass": "applications/" + script}}, 84 "applications": { 85 script: { 86 "unit_jars": option.current_dir + '/build', | 14 def prepare_env(self, script): 15 app_path = option.temp_dir + '/java' 16 web_inf_path = app_path + '/WEB-INF/' 17 classes_path = web_inf_path + 'classes/' 18 script_path = option.test_dir + '/java/' + script + '/' 19 20 if not os.path.isdir(app_path): 21 os.makedirs(app_path) --- 59 unchanged lines hidden (view full) --- 81 self.prepare_env(script) 82 83 self._load_conf( 84 { 85 "listeners": {"*:7080": {"pass": "applications/" + script}}, 86 "applications": { 87 script: { 88 "unit_jars": option.current_dir + '/build', |
87 "type": 'java', | 89 "type": self.get_application_type(), |
88 "processes": {"spare": 0}, 89 "working_directory": option.test_dir 90 + '/java/' 91 + script 92 + '/', 93 "webapp": option.temp_dir + '/java', 94 } 95 }, 96 }, 97 **kwargs 98 ) | 90 "processes": {"spare": 0}, 91 "working_directory": option.test_dir 92 + '/java/' 93 + script 94 + '/', 95 "webapp": option.temp_dir + '/java', 96 } 97 }, 98 }, 99 **kwargs 100 ) |