Tests: minor fixes.
Fixed temporary dir removing. Fixed printing path to log. Module checks moved to the separate file.
This commit is contained in:
@@ -6,26 +6,12 @@ from conftest import option
|
||||
|
||||
|
||||
class TestApplicationGo(TestApplicationProto):
|
||||
@classmethod
|
||||
def setup_class(cls, complete_check=True):
|
||||
unit = super().setup_class(complete_check=False)
|
||||
|
||||
# check go module
|
||||
|
||||
go_app = TestApplicationGo()
|
||||
go_app.temp_dir = unit.temp_dir
|
||||
proc = go_app.prepare_env('empty', 'app')
|
||||
if proc and proc.returncode == 0:
|
||||
cls.available['modules']['go'] = []
|
||||
|
||||
return unit if not complete_check else unit.complete()
|
||||
|
||||
def prepare_env(self, script, name, static=False):
|
||||
if not os.path.exists(self.temp_dir + '/go'):
|
||||
os.mkdir(self.temp_dir + '/go')
|
||||
|
||||
env = os.environ.copy()
|
||||
env['GOPATH'] = self.pardir + '/build/go'
|
||||
env['GOPATH'] = option.current_dir + '/build/go'
|
||||
|
||||
if static:
|
||||
args = [
|
||||
|
||||
@@ -49,10 +49,12 @@ class TestApplicationJava(TestApplicationProto):
|
||||
if not os.path.isdir(classes_path):
|
||||
os.makedirs(classes_path)
|
||||
|
||||
classpath = self.pardir + '/build/tomcat-servlet-api-9.0.13.jar'
|
||||
classpath = (
|
||||
option.current_dir + '/build/tomcat-servlet-api-9.0.13.jar'
|
||||
)
|
||||
|
||||
ws_jars = glob.glob(
|
||||
self.pardir + '/build/websocket-api-java-*.jar'
|
||||
option.current_dir + '/build/websocket-api-java-*.jar'
|
||||
)
|
||||
|
||||
if not ws_jars:
|
||||
@@ -78,7 +80,7 @@ class TestApplicationJava(TestApplicationProto):
|
||||
"listeners": {"*:7080": {"pass": "applications/" + script}},
|
||||
"applications": {
|
||||
script: {
|
||||
"unit_jars": self.pardir + '/build',
|
||||
"unit_jars": option.current_dir + '/build',
|
||||
"type": 'java',
|
||||
"processes": {"spare": 0},
|
||||
"working_directory": script_path,
|
||||
|
||||
@@ -7,17 +7,6 @@ from conftest import option, public_dir
|
||||
|
||||
|
||||
class TestApplicationNode(TestApplicationProto):
|
||||
@classmethod
|
||||
def setup_class(cls, complete_check=True):
|
||||
unit = super().setup_class(complete_check=False)
|
||||
|
||||
# check node module
|
||||
|
||||
if os.path.exists(unit.pardir + '/node/node_modules'):
|
||||
cls.available['modules']['node'] = []
|
||||
|
||||
return unit if not complete_check else unit.complete()
|
||||
|
||||
def load(self, script, name='app.js', **kwargs):
|
||||
# copy application
|
||||
|
||||
@@ -28,7 +17,7 @@ class TestApplicationNode(TestApplicationProto):
|
||||
# copy modules
|
||||
|
||||
shutil.copytree(
|
||||
self.pardir + '/node/node_modules',
|
||||
option.current_dir + '/node/node_modules',
|
||||
self.temp_dir + '/node/node_modules',
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user