Deleted
Added
java.py (1654:fc7d0578e124) | java.py (1657:0821c0c05a9f) |
---|---|
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 def load(self, script, name='app', **kwargs): | 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) 20 --- 49 unchanged lines hidden (view full) --- 70 71 try: 72 process = subprocess.Popen(javac, stderr=subprocess.STDOUT) 73 process.communicate() 74 75 except: 76 pytest.fail('Cann\'t run javac process.') 77 | 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) 20 --- 49 unchanged lines hidden (view full) --- 70 71 try: 72 process = subprocess.Popen(javac, stderr=subprocess.STDOUT) 73 process.communicate() 74 75 except: 76 pytest.fail('Cann\'t run javac process.') 77 |
78 def load(self, script, **kwargs): 79 self.prepare_env(script) 80 |
|
78 self._load_conf( 79 { 80 "listeners": {"*:7080": {"pass": "applications/" + script}}, 81 "applications": { 82 script: { 83 "unit_jars": option.current_dir + '/build', 84 "type": 'java', 85 "processes": {"spare": 0}, | 81 self._load_conf( 82 { 83 "listeners": {"*:7080": {"pass": "applications/" + script}}, 84 "applications": { 85 script: { 86 "unit_jars": option.current_dir + '/build', 87 "type": 'java', 88 "processes": {"spare": 0}, |
86 "working_directory": script_path, 87 "webapp": app_path, | 89 "working_directory": option.test_dir 90 + '/java/' 91 + script 92 + '/', 93 "webapp": option.temp_dir + '/java', |
88 } 89 }, 90 }, 91 **kwargs 92 ) | 94 } 95 }, 96 }, 97 **kwargs 98 ) |