diff options
Diffstat (limited to '')
27 files changed, 2 insertions, 35 deletions
diff --git a/test/conftest.py b/test/conftest.py index 0a4b541d..b36aabad 100644 --- a/test/conftest.py +++ b/test/conftest.py @@ -4,7 +4,6 @@ import platform import re import shutil import signal -import socket import stat import subprocess import sys @@ -13,11 +12,10 @@ import time from multiprocessing import Process import pytest - from unit.check.go import check_go +from unit.check.isolation import check_isolation from unit.check.node import check_node from unit.check.tls import check_openssl -from unit.check.isolation import check_isolation from unit.option import option from unit.utils import public_dir from unit.utils import waitforfiles diff --git a/test/test_access_log.py b/test/test_access_log.py index e82e42e3..045473ae 100644 --- a/test/test_access_log.py +++ b/test/test_access_log.py @@ -1,7 +1,6 @@ import time import pytest - from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_asgi_application.py b/test/test_asgi_application.py index 9f4b70a4..5770265d 100644 --- a/test/test_asgi_application.py +++ b/test/test_asgi_application.py @@ -3,7 +3,6 @@ import time from distutils.version import LooseVersion import pytest - from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_asgi_lifespan.py b/test/test_asgi_lifespan.py index 43286e22..3ecece43 100644 --- a/test/test_asgi_lifespan.py +++ b/test/test_asgi_lifespan.py @@ -2,7 +2,6 @@ import os from distutils.version import LooseVersion import pytest - from conftest import unit_stop from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_asgi_websockets.py b/test/test_asgi_websockets.py index 76cd8e80..7c9ec555 100644 --- a/test/test_asgi_websockets.py +++ b/test/test_asgi_websockets.py @@ -3,7 +3,6 @@ import time from distutils.version import LooseVersion import pytest - from unit.applications.lang.python import TestApplicationPython from unit.applications.websockets import TestApplicationWebsocket from unit.option import option diff --git a/test/test_configuration.py b/test/test_configuration.py index 7feb3adb..b7417264 100644 --- a/test/test_configuration.py +++ b/test/test_configuration.py @@ -1,5 +1,4 @@ import pytest - from unit.control import TestControl diff --git a/test/test_go_isolation.py b/test/test_go_isolation.py index 0cd83056..e8fa26c6 100644 --- a/test/test_go_isolation.py +++ b/test/test_go_isolation.py @@ -1,10 +1,8 @@ import grp import os import pwd -import shutil import pytest - from unit.applications.lang.go import TestApplicationGo from unit.option import option from unit.utils import getns diff --git a/test/test_go_isolation_rootfs.py b/test/test_go_isolation_rootfs.py index 1cc59c67..2bded5ec 100644 --- a/test/test_go_isolation_rootfs.py +++ b/test/test_go_isolation_rootfs.py @@ -1,7 +1,6 @@ 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 fdb557cf..ca355eb7 100644 --- a/test/test_http_header.py +++ b/test/test_http_header.py @@ -1,5 +1,4 @@ import pytest - from unit.applications.lang.python import TestApplicationPython diff --git a/test/test_java_isolation_rootfs.py b/test/test_java_isolation_rootfs.py index a401e23b..91773981 100644 --- a/test/test_java_isolation_rootfs.py +++ b/test/test_java_isolation_rootfs.py @@ -2,7 +2,6 @@ import os import subprocess import pytest - from unit.applications.lang.java import TestApplicationJava from unit.option import option diff --git a/test/test_java_websockets.py b/test/test_java_websockets.py index 729aa31d..315c496d 100644 --- a/test/test_java_websockets.py +++ b/test/test_java_websockets.py @@ -2,7 +2,6 @@ import struct import time import pytest - from unit.applications.lang.java import TestApplicationJava from unit.applications.websockets import TestApplicationWebsocket from unit.option import option diff --git a/test/test_node_application.py b/test/test_node_application.py index da29847a..b277dc3a 100644 --- a/test/test_node_application.py +++ b/test/test_node_application.py @@ -1,7 +1,6 @@ import re import pytest - from unit.applications.lang.node import TestApplicationNode from unit.utils import waitforfiles diff --git a/test/test_node_websockets.py b/test/test_node_websockets.py index d7444bf7..4f1e5906 100644 --- a/test/test_node_websockets.py +++ b/test/test_node_websockets.py @@ -2,7 +2,6 @@ import struct import time import pytest - from unit.applications.lang.node import TestApplicationNode from unit.applications.websockets import TestApplicationWebsocket from unit.option import option diff --git a/test/test_perl_application.py b/test/test_perl_application.py index e906aaca..dfd8be6c 100644 --- a/test/test_perl_application.py +++ b/test/test_perl_application.py @@ -1,7 +1,6 @@ import re import pytest - from unit.applications.lang.perl import TestApplicationPerl diff --git a/test/test_php_application.py b/test/test_php_application.py index 9f0da531..981d9e95 100644 --- a/test/test_php_application.py +++ b/test/test_php_application.py @@ -5,7 +5,6 @@ import time from subprocess import call import pytest - from unit.applications.lang.php import TestApplicationPHP from unit.option import option diff --git a/test/test_php_isolation.py b/test/test_php_isolation.py index b0fea383..2e458023 100644 --- a/test/test_php_isolation.py +++ b/test/test_php_isolation.py @@ -1,7 +1,4 @@ -import shutil - import pytest - from unit.applications.lang.php import TestApplicationPHP from unit.option import option diff --git a/test/test_proxy.py b/test/test_proxy.py index 0eebab1e..b7c34390 100644 --- a/test/test_proxy.py +++ b/test/test_proxy.py @@ -3,7 +3,6 @@ import socket import time import pytest - from conftest import run_process from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_python_application.py b/test/test_python_application.py index 01f53f8d..5aa60712 100644 --- a/test/test_python_application.py +++ b/test/test_python_application.py @@ -4,7 +4,6 @@ import re import time import pytest - from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_python_isolation.py b/test/test_python_isolation.py index ad830269..aa96af51 100644 --- a/test/test_python_isolation.py +++ b/test/test_python_isolation.py @@ -1,7 +1,5 @@ -import shutil import pytest - from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_python_isolation_chroot.py b/test/test_python_isolation_chroot.py index 7f559bcc..7281f5f6 100644 --- a/test/test_python_isolation_chroot.py +++ b/test/test_python_isolation_chroot.py @@ -1,5 +1,4 @@ import pytest - from unit.applications.lang.python import TestApplicationPython diff --git a/test/test_python_procman.py b/test/test_python_procman.py index 42a197a7..bfc218a9 100644 --- a/test/test_python_procman.py +++ b/test/test_python_procman.py @@ -3,7 +3,6 @@ import subprocess import time import pytest - from unit.applications.lang.python import TestApplicationPython from unit.option import option diff --git a/test/test_routing.py b/test/test_routing.py index 30f25a9c..21c1899e 100644 --- a/test/test_routing.py +++ b/test/test_routing.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- import pytest - from unit.applications.proto import TestApplicationProto from unit.option import option diff --git a/test/test_ruby_application.py b/test/test_ruby_application.py index 8311f52f..a84b2990 100644 --- a/test/test_ruby_application.py +++ b/test/test_ruby_application.py @@ -1,7 +1,6 @@ import re import pytest - from unit.applications.lang.ruby import TestApplicationRuby diff --git a/test/test_ruby_isolation.py b/test/test_ruby_isolation.py index fab428e9..c49b6732 100644 --- a/test/test_ruby_isolation.py +++ b/test/test_ruby_isolation.py @@ -1,8 +1,7 @@ +import os import shutil -import os import pytest - from unit.applications.lang.ruby import TestApplicationRuby from unit.option import option diff --git a/test/test_settings.py b/test/test_settings.py index 22830a3b..c59ca8b9 100644 --- a/test/test_settings.py +++ b/test/test_settings.py @@ -3,7 +3,6 @@ import socket import time import pytest - from unit.applications.lang.python import TestApplicationPython @@ -297,4 +296,3 @@ Connection: close assert bool(resp), 'response from application 4' assert resp['status'] == 200, 'status 4' assert resp['body'] == body, 'body 4' - diff --git a/test/test_static.py b/test/test_static.py index 4591aa03..3e85b435 100644 --- a/test/test_static.py +++ b/test/test_static.py @@ -2,7 +2,6 @@ import os import socket import pytest - from unit.applications.proto import TestApplicationProto from unit.option import option from unit.utils import waitforfiles diff --git a/test/test_tls.py b/test/test_tls.py index 5a408ee2..f5df5ee1 100644 --- a/test/test_tls.py +++ b/test/test_tls.py @@ -4,7 +4,6 @@ import ssl import subprocess import pytest - from unit.applications.tls import TestApplicationTLS from unit.option import option |