summaryrefslogtreecommitdiffhomepage
path: root/test/unit/applications/lang
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2020-10-01 10:17:00 +0100
committerAndrei Zeliankou <zelenkov@nginx.com>2020-10-01 10:17:00 +0100
commitd491527555c076695a4202577198e12bf0b919ec (patch)
tree6640d7466137b41780c1ce94683fc869b68241cc /test/unit/applications/lang
parent1fe1518ab1b9ad5dac6f2f8a1e41571cbc4d96e9 (diff)
downloadunit-d491527555c076695a4202577198e12bf0b919ec.tar.gz
unit-d491527555c076695a4202577198e12bf0b919ec.tar.bz2
Tests: minor fixes.
Fixed temporary dir removing. Fixed printing path to log. Module checks moved to the separate file.
Diffstat (limited to 'test/unit/applications/lang')
-rw-r--r--test/unit/applications/lang/go.py16
-rw-r--r--test/unit/applications/lang/java.py8
-rw-r--r--test/unit/applications/lang/node.py13
3 files changed, 7 insertions, 30 deletions
diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 069bdecb..946b5421 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -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 = [
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index b5511883..93427709 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -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,
diff --git a/test/unit/applications/lang/node.py b/test/unit/applications/lang/node.py
index f510acce..dbb7036b 100644
--- a/test/unit/applications/lang/node.py
+++ b/test/unit/applications/lang/node.py
@@ -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',
)