From 07789a23e9c513dba87b020fae2989a57955e8a6 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Sun, 6 Dec 2020 16:01:59 +0000 Subject: Tests: options moved to the separate class. This change is necessary to separate the logic and prevent possible circular dependency. --- test/test_java_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test_java_application.py') diff --git a/test/test_java_application.py b/test/test_java_application.py index 41345e87..04210ebf 100644 --- a/test/test_java_application.py +++ b/test/test_java_application.py @@ -3,10 +3,10 @@ import os import re import time -from conftest import option from conftest import public_dir from conftest import skip_alert from unit.applications.lang.java import TestApplicationJava +from unit.option import option class TestJavaApplication(TestApplicationJava): prerequisites = {'modules': {'java': 'all'}} -- cgit From 8f916285639d7f9aac9ef03cace5e4dcbcca70cd Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Tue, 8 Dec 2020 14:37:25 +0000 Subject: Tests: utils module introduced. --- test/test_java_application.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test/test_java_application.py') diff --git a/test/test_java_application.py b/test/test_java_application.py index 04210ebf..572e18e8 100644 --- a/test/test_java_application.py +++ b/test/test_java_application.py @@ -3,10 +3,10 @@ import os import re import time -from conftest import public_dir from conftest import skip_alert from unit.applications.lang.java import TestApplicationJava from unit.option import option +from unit.utils import public_dir class TestJavaApplication(TestApplicationJava): prerequisites = {'modules': {'java': 'all'}} -- cgit From b2e767819f04153944d525ef8d97d2f3a7a9af74 Mon Sep 17 00:00:00 2001 From: Andrei Zeliankou Date: Tue, 8 Dec 2020 14:37:33 +0000 Subject: Tests: skip_alert() converted to the fixture. --- test/test_java_application.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'test/test_java_application.py') diff --git a/test/test_java_application.py b/test/test_java_application.py index 572e18e8..4a67f291 100644 --- a/test/test_java_application.py +++ b/test/test_java_application.py @@ -3,7 +3,6 @@ import os import re import time -from conftest import skip_alert from unit.applications.lang.java import TestApplicationJava from unit.option import option from unit.utils import public_dir @@ -11,7 +10,7 @@ from unit.utils import public_dir class TestJavaApplication(TestApplicationJava): prerequisites = {'modules': {'java': 'all'}} - def test_java_conf_error(self, temp_dir): + def test_java_conf_error(self, temp_dir, skip_alert): skip_alert( r'realpath.*failed', r'failed to apply new conf', -- cgit