diff options
46 files changed, 125 insertions, 95 deletions
diff --git a/test/conftest.py b/test/conftest.py index 0bc5cdf9..b62264ca 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -1,16 +1,17 @@ import fcntl import os import platform -import pytest +import re import shutil import signal import stat import subprocess import sys -import re import tempfile import time +import pytest + from unit.check.go import check_go from unit.check.node import check_node from unit.check.tls import check_openssl diff --git a/test/test_access_log.py b/test/test_access_log.py index 010c56c2..eaba82ab 100644 --- a/test/test_access_log.py +++ b/test/test_access_log.py @@ -1,6 +1,7 @@ -import pytest import time +import pytest + from unit.applications.lang.python import TestApplicationPython diff --git a/test/test_asgi_application.py b/test/test_asgi_application.py index 7816caec..948d9823 100644 --- a/test/test_asgi_application.py +++ b/test/test_asgi_application.py @@ -1,12 +1,11 @@ -import grp -import pytest -import pwd import re import time from distutils.version import LooseVersion -from unit.applications.lang.python import TestApplicationPython +import pytest + from conftest import skip_alert +from unit.applications.lang.python import TestApplicationPython class TestASGIApplication(TestApplicationPython): @@ -18,7 +17,7 @@ class TestASGIApplication(TestApplicationPython): with open(self.temp_dir + '/unit.log', 'r', errors='ignore') as f: return re.findall(pattern, f.read()) - def test_asgi_application__variables(self): + def test_asgi_application_variables(self): self.load('variables') body = 'Test body string.' @@ -63,7 +62,7 @@ custom-header: BLAH }, 'headers' assert resp['body'] == body, 'body' - def test_asgi_application__query_string(self): + def test_asgi_application_query_string(self): self.load('query_string') resp = self.get(url='/?var1=val1&var2=val2') @@ -72,7 +71,7 @@ custom-header: BLAH resp['headers']['query-string'] == 'var1=val1&var2=val2' ), 'query-string header' - def test_asgi_application__query_string_space(self): + def test_asgi_application_query_string_space(self): self.load('query_string') resp = self.get(url='/ ?var1=val1&var2=val2') @@ -95,7 +94,7 @@ custom-header: BLAH resp['headers']['query-string'] == ' var1= val1 & var2=val2' ), 'query-string space 4' - def test_asgi_application__query_string_empty(self): + def test_asgi_application_query_string_empty(self): self.load('query_string') resp = self.get(url='/?') @@ -103,7 +102,7 @@ custom-header: BLAH assert resp['status'] == 200, 'query string empty status' assert resp['headers']['query-string'] == '', 'query string empty' - def test_asgi_application__query_string_absent(self): + def test_asgi_application_query_string_absent(self): self.load('query_string') resp = self.get() @@ -112,7 +111,7 @@ custom-header: BLAH assert resp['headers']['query-string'] == '', 'query string absent' @pytest.mark.skip('not yet') - def test_asgi_application__server_port(self): + def test_asgi_application_server_port(self): self.load('server_port') assert ( @@ -120,7 +119,7 @@ custom-header: BLAH ), 'Server-Port header' @pytest.mark.skip('not yet') - def test_asgi_application__working_directory_invalid(self): + def test_asgi_application_working_directory_invalid(self): self.load('empty') assert 'success' in self.conf( @@ -129,14 +128,14 @@ custom-header: BLAH assert self.get()['status'] == 500, 'status' - def test_asgi_application__204_transfer_encoding(self): + def test_asgi_application_204_transfer_encoding(self): self.load('204_no_content') assert ( 'Transfer-Encoding' not in self.get()['headers'] ), '204 header transfer encoding' - def test_asgi_application__shm_ack_handle(self): + def test_asgi_application_shm_ack_handle(self): self.load('mirror') # Minimum possible limit @@ -379,7 +378,7 @@ Connection: close self.get(headers=headers_delay_1) - def test_asgi_application__loading_error(self): + def test_asgi_application_loading_error(self): skip_alert(r'Python failed to import module "blah"') self.load('empty') @@ -388,7 +387,7 @@ Connection: close assert self.get()['status'] == 503, 'loading error' - def test_asgi_application__threading(self): + def test_asgi_application_threading(self): """wait_for_record() timeouts after 5s while every thread works at least 3s. So without releasing GIL test should fail. """ diff --git a/test/test_asgi_lifespan.py b/test/test_asgi_lifespan.py index 3d6fdcce..c37a1aae 100644 --- a/test/test_asgi_lifespan.py +++ b/test/test_asgi_lifespan.py @@ -1,9 +1,11 @@ import os -import pytest from distutils.version import LooseVersion +import pytest + +from conftest import option +from conftest import public_dir from unit.applications.lang.python import TestApplicationPython -from conftest import option, public_dir class TestASGILifespan(TestApplicationPython): @@ -19,11 +21,16 @@ class TestASGILifespan(TestApplicationPython): shutdown_path = option.test_dir + '/python/lifespan/empty/shutdown' version_path = option.test_dir + '/python/lifespan/empty/version' + os.chmod(option.test_dir + '/python/lifespan/empty', 0o777) + open(startup_path, 'a').close() + os.chmod(startup_path, 0o777) + open(shutdown_path, 'a').close() - open(version_path, 'a').close() + os.chmod(shutdown_path, 0o777) - public_dir(option.test_dir + '/python/lifespan/empty') + open(version_path, 'a').close() + os.chmod(version_path, 0o777) assert self.get()['status'] == 204 diff --git a/test/test_asgi_websockets.py b/test/test_asgi_websockets.py index cbd77109..ab49b130 100644 --- a/test/test_asgi_websockets.py +++ b/test/test_asgi_websockets.py @@ -1,11 +1,13 @@ -import pytest import struct import time from distutils.version import LooseVersion +import pytest + +from conftest import option +from conftest import skip_alert from unit.applications.lang.python import TestApplicationPython from unit.applications.websockets import TestApplicationWebsocket -from conftest import option, skip_alert class TestASGIWebsockets(TestApplicationPython): diff --git a/test/test_configuration.py b/test/test_configuration.py index 07b8d522..d1e6f000 100644 --- a/test/test_configuration.py +++ b/test/test_configuration.py @@ -1,7 +1,7 @@ import pytest -from unit.control import TestControl from conftest import skip_alert +from unit.control import TestControl class TestConfiguration(TestControl): @@ -15,7 +15,7 @@ class TestConfiguration(TestControl): def test_json_unicode(self): assert 'success' in self.conf( - b""" + u""" { "ap\u0070": { "type": "\u0070ython", @@ -53,8 +53,8 @@ class TestConfiguration(TestControl): assert 'приложение' in self.conf_get('applications'), 'unicode 2 get' def test_json_unicode_number(self): - assert 'error' in self.conf( - b""" + assert 'success' in self.conf( + u""" { "app": { "type": "python", diff --git a/test/test_go_application.py b/test/test_go_application.py index 828a8e6e..8c77dfc5 100644 --- a/test/test_go_application.py +++ b/test/test_go_application.py @@ -1,6 +1,7 @@ -from unit.applications.lang.go import TestApplicationGo import re +from unit.applications.lang.go import TestApplicationGo + class TestGoApplication(TestApplicationGo): prerequisites = {'modules': {'go': 'all'}} diff --git a/test/test_go_isolation.py b/test/test_go_isolation.py index bcfdd015..1e7243f6 100644 --- a/test/test_go_isolation.py +++ b/test/test_go_isolation.py @@ -1,6 +1,7 @@ import grp import os import pwd + import pytest from unit.applications.lang.go import TestApplicationGo diff --git a/test/test_go_isolation_rootfs.py b/test/test_go_isolation_rootfs.py index 68891cd6..d8e177b1 100644 --- a/test/test_go_isolation_rootfs.py +++ b/test/test_go_isolation_rootfs.py @@ -1,4 +1,5 @@ import os + import pytest from unit.applications.lang.go import TestApplicationGo diff --git a/test/test_http_header.py b/test/test_http_header.py index 8c1e211b..8381a0d9 100644 --- a/test/test_http_header.py +++ b/test/test_http_header.py @@ -108,7 +108,7 @@ class TestHTTPHeader(TestApplicationPython): resp = self.get( headers={ 'Host': 'localhost', - 'Custom-Header': '(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~', + 'Custom-Header': r'(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~', 'Connection': 'close', } ) @@ -116,7 +116,7 @@ class TestHTTPHeader(TestApplicationPython): assert resp['status'] == 200, 'value chars status' assert ( resp['headers']['Custom-Header'] - == '(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~' + == r'(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~' ), 'value chars custom header' def test_http_header_value_chars_edge(self): diff --git a/test/test_java_application.py b/test/test_java_application.py index a2bd3d44..afcdf651 100644 --- a/test/test_java_application.py +++ b/test/test_java_application.py @@ -3,8 +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 conftest import option, public_dir, skip_alert class TestJavaApplication(TestApplicationJava): prerequisites = {'modules': {'java': 'all'}} diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py index df3ccdfa..f0f04df1 100644 --- a/test/test_java_isolation_rootfs.py +++ b/test/test_java_isolation_rootfs.py @@ -1,9 +1,10 @@ import os import subprocess + import pytest -from unit.applications.lang.java import TestApplicationJava from conftest import option +from unit.applications.lang.java import TestApplicationJava class TestJavaIsolationRootfs(TestApplicationJava): diff --git a/test/test_java_websockets.py b/test/test_java_websockets.py index 1bbefa1e..7e6d82e8 100644 --- a/test/test_java_websockets.py +++ b/test/test_java_websockets.py @@ -1,10 +1,12 @@ -import pytest import struct import time +import pytest + +from conftest import option +from conftest import skip_alert from unit.applications.lang.java import TestApplicationJava from unit.applications.websockets import TestApplicationWebsocket -from conftest import option, skip_alert class TestJavaWebsockets(TestApplicationJava): diff --git a/test/test_node_application.py b/test/test_node_application.py index c2b0ed69..a0b882f3 100644 --- a/test/test_node_application.py +++ b/test/test_node_application.py @@ -1,8 +1,9 @@ -import pytest import re -from unit.applications.lang.node import TestApplicationNode +import pytest + from conftest import waitforfiles +from unit.applications.lang.node import TestApplicationNode class TestNodeApplication(TestApplicationNode): @@ -50,8 +51,8 @@ class TestNodeApplication(TestApplicationNode): raw_headers = headers.pop('Request-Raw-Headers') assert re.search( r'^(?:Host|localhost|Content-Type|' - 'text\/html|Custom-Header|blah|Content-Length|17|Connection|' - 'close|,)+$', + r'text\/html|Custom-Header|blah|Content-Length|17|Connection|' + r'close|,)+$', raw_headers, ), 'raw headers' diff --git a/test/test_node_websockets.py b/test/test_node_websockets.py index 5af2f6f3..6a6b7f2d 100644 --- a/test/test_node_websockets.py +++ b/test/test_node_websockets.py @@ -1,10 +1,12 @@ -import pytest import struct import time +import pytest + +from conftest import option +from conftest import skip_alert from unit.applications.lang.node import TestApplicationNode from unit.applications.websockets import TestApplicationWebsocket -from conftest import option, skip_alert class TestNodeWebsockets(TestApplicationNode): diff --git a/test/test_perl_application.py b/test/test_perl_application.py index bb63eceb..78e32a43 100644 --- a/test/test_perl_application.py +++ b/test/test_perl_application.py @@ -1,8 +1,9 @@ -import pytest import re -from unit.applications.lang.perl import TestApplicationPerl +import pytest + from conftest import skip_alert +from unit.applications.lang.perl import TestApplicationPerl class TestPerlApplication(TestApplicationPerl): diff --git a/test/test_php_application.py b/test/test_php_application.py index 18a5c085..48fab5ee 100644 --- a/test/test_php_application.py +++ b/test/test_php_application.py @@ -1,11 +1,12 @@ import os -import pytest import re import shutil import time -from unit.applications.lang.php import TestApplicationPHP +import pytest + from conftest import option +from unit.applications.lang.php import TestApplicationPHP class TestPHPApplication(TestApplicationPHP): prerequisites = {'modules': {'php': 'all'}} diff --git a/test/test_php_isolation.py b/test/test_php_isolation.py index 556bd387..8ab3419a 100644 --- a/test/test_php_isolation.py +++ b/test/test_php_isolation.py @@ -1,8 +1,8 @@ import pytest +from conftest import option from unit.applications.lang.php import TestApplicationPHP from unit.feature.isolation import TestFeatureIsolation -from conftest import option class TestPHPIsolation(TestApplicationPHP): diff --git a/test/test_php_targets.py b/test/test_php_targets.py index 2eadf071..e64cd6b6 100644 --- a/test/test_php_targets.py +++ b/test/test_php_targets.py @@ -1,5 +1,5 @@ -from unit.applications.lang.php import TestApplicationPHP from conftest import option +from unit.applications.lang.php import TestApplicationPHP class TestPHPTargets(TestApplicationPHP): diff --git a/test/test_proxy.py b/test/test_proxy.py index 1476670c..d02c96a7 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -1,10 +1,12 @@ -import pytest import re import socket import time +import pytest + +from conftest import option +from conftest import skip_alert from unit.applications.lang.python import TestApplicationPython -from conftest import option, skip_alert class TestProxy(TestApplicationPython): @@ -215,7 +217,7 @@ Content-Length: 10 == header_value ), 'custom header' - header_value = '(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~' + header_value = r'(),/:;<=>?@[\]{}\t !#$%&\'*+-.^_`|~' assert ( self.get_http10( headers={'Host': 'localhost', 'Custom-Header': header_value} diff --git a/test/test_proxy_chunked.py b/test/test_proxy_chunked.py index 93746703..26023617 100644 --- a/test/test_proxy_chunked.py +++ b/test/test_proxy_chunked.py @@ -51,7 +51,7 @@ class TestProxyChunked(TestApplicationPython): for line in re.split('\r\n', body): add = '' - m1 = re.search('(.*)\sX\s(\d+)', line) + m1 = re.search(r'(.*)\sX\s(\d+)', line) if m1 is not None: add = m1.group(1) * int(m1.group(2)) diff --git a/test/test_python_application.py b/test/test_python_application.py index 434ceb19..3e27a24c 100644 --- a/test/test_python_application.py +++ b/test/test_python_application.py @@ -1,11 +1,12 @@ import grp -import pytest import pwd import re import time -from unit.applications.lang.python import TestApplicationPython +import pytest + from conftest import skip_alert +from unit.applications.lang.python import TestApplicationPython class TestPythonApplication(TestApplicationPython): diff --git a/test/test_python_isolation.py b/test/test_python_isolation.py index 59ac670a..ac678103 100644 --- a/test/test_python_isolation.py +++ b/test/test_python_isolation.py @@ -94,4 +94,3 @@ class TestPythonIsolation(TestApplicationPython): self.load('empty', isolation=isolation) assert (self.get()['status'] == 200), 'enabled language_deps' - diff --git a/test/test_python_procman.py b/test/test_python_procman.py index 7e727fa8..8eccae3e 100644 --- a/test/test_python_procman.py +++ b/test/test_python_procman.py @@ -1,8 +1,9 @@ -import pytest import re import subprocess import time +import pytest + from unit.applications.lang.python import TestApplicationPython diff --git a/test/test_respawn.py b/test/test_respawn.py index d40e78a4..18b9d535 100644 --- a/test/test_respawn.py +++ b/test/test_respawn.py @@ -2,8 +2,8 @@ import re import subprocess import time -from unit.applications.lang.python import TestApplicationPython from conftest import skip_alert +from unit.applications.lang.python import TestApplicationPython class TestRespawn(TestApplicationPython): diff --git a/test/test_routing.py b/test/test_routing.py index 32a7fbc8..2b528435 100644 --- a/test/test_routing.py +++ b/test/test_routing.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- import pytest +from conftest import option +from conftest import skip_alert from unit.applications.proto import TestApplicationProto -from conftest import option, skip_alert class TestRouting(TestApplicationProto): diff --git a/test/test_ruby_application.py b/test/test_ruby_application.py index bdd1afb9..f84935f8 100644 --- a/test/test_ruby_application.py +++ b/test/test_ruby_application.py @@ -1,8 +1,9 @@ -import pytest import re -from unit.applications.lang.ruby import TestApplicationRuby +import pytest + from conftest import skip_alert +from unit.applications.lang.ruby import TestApplicationRuby class TestRubyApplication(TestApplicationRuby): diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py index e88c60b2..13ca0e16 100644 --- a/test/test_ruby_isolation.py +++ b/test/test_ruby_isolation.py @@ -1,10 +1,9 @@ -import os + import pytest -import shutil +from conftest import option from unit.applications.lang.ruby import TestApplicationRuby from unit.feature.isolation import TestFeatureIsolation -from conftest import option class TestRubyIsolation(TestApplicationRuby): diff --git a/test/test_settings.py b/test/test_settings.py index 89f55703..b0af6b04 100644 --- a/test/test_settings.py +++ b/test/test_settings.py @@ -1,9 +1,10 @@ -import pytest +import re import socket import time +import pytest + from unit.applications.lang.python import TestApplicationPython -import re class TestSettings(TestApplicationPython): diff --git a/test/test_share_fallback.py b/test/test_share_fallback.py index 391066ec..391d0836 100644 --- a/test/test_share_fallback.py +++ b/test/test_share_fallback.py @@ -1,7 +1,7 @@ import os -from unit.applications.proto import TestApplicationProto from conftest import skip_alert +from unit.applications.proto import TestApplicationProto class TestStatic(TestApplicationProto): diff --git a/test/test_static.py b/test/test_static.py index 2290bc38..0b82b4e8 100644 --- a/test/test_static.py +++ b/test/test_static.py @@ -1,9 +1,10 @@ import os -import pytest import socket -from unit.applications.proto import TestApplicationProto +import pytest + from conftest import waitforfiles +from unit.applications.proto import TestApplicationProto class TestStatic(TestApplicationProto): diff --git a/test/test_tls.py b/test/test_tls.py index 9881e973..518a834c 100644 --- a/test/test_tls.py +++ b/test/test_tls.py @@ -1,11 +1,12 @@ import io -import pytest import re import ssl import subprocess -from unit.applications.tls import TestApplicationTLS +import pytest + from conftest import skip_alert +from unit.applications.tls import TestApplicationTLS class TestTLS(TestApplicationTLS): @@ -527,7 +528,7 @@ basicConstraints = critical,CA:TRUE""" self.wait_for_record( re.compile( - ' (?!' + app_id + '#)(\d+)#\d+ "mirror" application started' + r' (?!' + app_id + r'#)(\d+)#\d+ "mirror" application started' ) ) diff --git a/test/test_upstreams_rr.py b/test/test_upstreams_rr.py index ceab11c3..2ecf1d9a 100644 --- a/test/test_upstreams_rr.py +++ b/test/test_upstreams_rr.py @@ -1,8 +1,8 @@ import os import re -from unit.applications.lang.python import TestApplicationPython from conftest import option +from unit.applications.lang.python import TestApplicationPython class TestUpstreamsRR(TestApplicationPython): diff --git a/test/test_usr1.py b/test/test_usr1.py index 19081223..2e48c18f 100644 --- a/test/test_usr1.py +++ b/test/test_usr1.py @@ -1,8 +1,8 @@ import os from subprocess import call -from unit.applications.lang.python import TestApplicationPython from conftest import waitforfiles +from unit.applications.lang.python import TestApplicationPython class TestUSR1(TestApplicationPython): diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py index 946b5421..7715bd6c 100644 --- a/test/unit/applications/lang/go.py +++ b/test/unit/applications/lang/go.py @@ -1,8 +1,8 @@ import os import subprocess -from unit.applications.proto import TestApplicationProto from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationGo(TestApplicationProto): diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py index 93427709..01cbfa0b 100644 --- a/test/unit/applications/lang/java.py +++ b/test/unit/applications/lang/java.py @@ -1,11 +1,11 @@ import glob import os -import pytest import shutil import subprocess -from unit.applications.proto import TestApplicationProto +import pytest from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationJava(TestApplicationProto): diff --git a/test/unit/applications/lang/node.py b/test/unit/applications/lang/node.py index dbb7036b..877fc461 100644 --- a/test/unit/applications/lang/node.py +++ b/test/unit/applications/lang/node.py @@ -1,9 +1,9 @@ -import os import shutil from urllib.parse import quote +from conftest import option +from conftest import public_dir from unit.applications.proto import TestApplicationProto -from conftest import option, public_dir class TestApplicationNode(TestApplicationProto): diff --git a/test/unit/applications/lang/perl.py b/test/unit/applications/lang/perl.py index d686cc8a..a27c7649 100644 --- a/test/unit/applications/lang/perl.py +++ b/test/unit/applications/lang/perl.py @@ -1,5 +1,5 @@ -from unit.applications.proto import TestApplicationProto from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationPerl(TestApplicationProto): diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py index 6ac3d710..2d50df2e 100644 --- a/test/unit/applications/lang/php.py +++ b/test/unit/applications/lang/php.py @@ -1,5 +1,5 @@ -from unit.applications.proto import TestApplicationProto from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationPHP(TestApplicationProto): diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py index 75d34722..47b95dac 100644 --- a/test/unit/applications/lang/python.py +++ b/test/unit/applications/lang/python.py @@ -1,10 +1,10 @@ import os import shutil -import pytest - -from unit.applications.proto import TestApplicationProto from urllib.parse import quote + +import pytest from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationPython(TestApplicationProto): diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py index a6c39b2a..bc3cefc6 100644 --- a/test/unit/applications/lang/ruby.py +++ b/test/unit/applications/lang/ruby.py @@ -1,5 +1,5 @@ -from unit.applications.proto import TestApplicationProto from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationRuby(TestApplicationProto): diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py index 7bf7e244..2f748c21 100644 --- a/test/unit/applications/proto.py +++ b/test/unit/applications/proto.py @@ -2,8 +2,8 @@ import os import re import time -from unit.control import TestControl from conftest import option +from unit.control import TestControl class TestApplicationProto(TestControl): diff --git a/test/unit/applications/tls.py b/test/unit/applications/tls.py index 7c95f27b..fdf681ae 100644 --- a/test/unit/applications/tls.py +++ b/test/unit/applications/tls.py @@ -1,10 +1,9 @@ import os -import re import ssl import subprocess -from unit.applications.proto import TestApplicationProto from conftest import option +from unit.applications.proto import TestApplicationProto class TestApplicationTLS(TestApplicationProto): diff --git a/test/unit/applications/websockets.py b/test/unit/applications/websockets.py index bae40620..cc720a98 100644 --- a/test/unit/applications/websockets.py +++ b/test/unit/applications/websockets.py @@ -1,12 +1,11 @@ import base64 import hashlib import itertools -import pytest import random -import re import select import struct +import pytest from unit.applications.proto import TestApplicationProto GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11" diff --git a/test/unit/http.py b/test/unit/http.py index e5231b3d..7845f9a8 100644 --- a/test/unit/http.py +++ b/test/unit/http.py @@ -2,14 +2,14 @@ import binascii import io import json import os -import pytest import re import select import socket import time -from unit.main import TestUnit +import pytest from conftest import option +from unit.main import TestUnit class TestHTTP(TestUnit): diff --git a/test/unit/main.py b/test/unit/main.py index 053ce145..d5940995 100644 --- a/test/unit/main.py +++ b/test/unit/main.py @@ -1,19 +1,21 @@ -import argparse import atexit import os -import platform -import pytest import re import shutil import signal import stat import subprocess -import sys import tempfile import time -from conftest import option, public_dir, waitforfiles, _check_alerts, _print_log from multiprocessing import Process +import pytest +from conftest import _check_alerts +from conftest import _print_log +from conftest import option +from conftest import public_dir +from conftest import waitforfiles + class TestUnit(): @classmethod |