technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Tests: style and minor fixes in java.py.

Browse Source
This commit is contained in:
Andrey Zelenkov
2019-09-16 15:37:32 +03:00
parent a5b9c9241e
commit 13ecbe333a
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/unit/applications/lang/java.py
View File

@@ -7,11 +7,9 @@ from unit.applications.proto import TestApplicationProto
class TestApplicationJava(TestApplicationProto):
def load(self, script, name='app'):
app_path = self.testdir + '/java'
web_inf_path = app_path + '/WEB-INF/'
classes_path = web_inf_path + 'classes/'
script_path = self.current_dir + '/java/' + script + '/'
if not os.path.isdir(app_path):
@@ -20,27 +18,29 @@ class TestApplicationJava(TestApplicationProto):
src = []
for f in os.listdir(script_path):
file_path = script_path + f
if f.endswith('.java'):
src.append(script_path + f)
src.append(file_path)
continue
if f.startswith('.') or f == 'Makefile':
continue
if os.path.isdir(script_path + f):
if os.path.isdir(file_path):
if f == 'WEB-INF':
continue
shutil.copytree(script_path + f, app_path + '/' + f)
shutil.copytree(file_path, app_path + '/' + f)
continue
if f == 'web.xml':
if not os.path.isdir(web_inf_path):
os.makedirs(web_inf_path)
shutil.copy2(script_path + f, web_inf_path)
shutil.copy2(file_path, web_inf_path)
else:
shutil.copy2(script_path + f, app_path)
shutil.copy2(file_path, app_path)
if src:
if not os.path.isdir(classes_path):