Merged with the default branch.1.20.0-1

10 files changed, 101 insertions, 107 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 83bde4d8..7715bd6c 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -1,30 +1,17 @@
 import os
 import subprocess
 
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
 class TestApplicationGo(TestApplicationProto):
-    @classmethod
-    def setUpClass(cls, complete_check=True):
-        unit = super().setUpClass(complete_check=False)
-
-        # check go module
-
-        go_app = TestApplicationGo()
-        go_app.testdir = unit.testdir
-        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.testdir + '/go'):
-            os.mkdir(self.testdir + '/go')
+        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 = [
@@ -35,16 +22,16 @@ class TestApplicationGo(TestApplicationProto):
                 '-ldflags',
                 '-extldflags "-static"',
                 '-o',
-                self.testdir + '/go/' + name,
-                self.current_dir + '/go/' + script + '/' + name + '.go',
+                self.temp_dir + '/go/' + name,
+                option.test_dir + '/go/' + script + '/' + name + '.go',
             ]
         else:
             args = [
                 'go',
                 'build',
                 '-o',
-                self.testdir + '/go/' + name,
-                self.current_dir + '/go/' + script + '/' + name + '.go',
+                self.temp_dir + '/go/' + name,
+                option.test_dir + '/go/' + script + '/' + name + '.go',
             ]
 
         try:
@@ -59,8 +46,8 @@ class TestApplicationGo(TestApplicationProto):
     def load(self, script, name='app', **kwargs):
         static_build = False
 
-        wdir = self.current_dir + "/go/" + script
-        executable = self.testdir + "/go/" + name
+        wdir = option.test_dir + "/go/" + script
+        executable = self.temp_dir + "/go/" + name
 
         if 'isolation' in kwargs and 'rootfs' in kwargs['isolation']:
             wdir = "/go/"
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index c2c6dc51..01cbfa0b 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -3,15 +3,17 @@ import os
 import shutil
 import subprocess
 
+import pytest
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
 class TestApplicationJava(TestApplicationProto):
     def load(self, script, name='app', **kwargs):
-        app_path = self.testdir + '/java'
+        app_path = self.temp_dir + '/java'
         web_inf_path = app_path + '/WEB-INF/'
         classes_path = web_inf_path + 'classes/'
-        script_path = self.current_dir + '/java/' + script + '/'
+        script_path = option.test_dir + '/java/' + script + '/'
 
         if not os.path.isdir(app_path):
             os.makedirs(app_path)
@@ -47,14 +49,16 @@ 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:
-                self.fail('websocket api jar not found.')
+                pytest.fail('websocket api jar not found.')
 
             javac = [
                 'javac',
@@ -69,14 +73,14 @@ class TestApplicationJava(TestApplicationProto):
                 process.communicate()
 
             except:
-                self.fail('Cann\'t run javac process.')
+                pytest.fail('Cann\'t run javac process.')
 
         self._load_conf(
             {
                 "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 cf2a99f6..877fc461 100644
--- a/test/unit/applications/lang/node.py
+++ b/test/unit/applications/lang/node.py
@@ -1,37 +1,27 @@
-import os
 import shutil
 from urllib.parse import quote
 
+from conftest import option
+from conftest import public_dir
 from unit.applications.proto import TestApplicationProto
 
 
 class TestApplicationNode(TestApplicationProto):
-    @classmethod
-    def setUpClass(cls, complete_check=True):
-        unit = super().setUpClass(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
 
         shutil.copytree(
-            self.current_dir + '/node/' + script, self.testdir + '/node'
+            option.test_dir + '/node/' + script, self.temp_dir + '/node'
         )
 
         # copy modules
 
         shutil.copytree(
-            self.pardir + '/node/node_modules',
-            self.testdir + '/node/node_modules',
+            option.current_dir + '/node/node_modules',
+            self.temp_dir + '/node/node_modules',
         )
 
-        self.public_dir(self.testdir + '/node')
+        public_dir(self.temp_dir + '/node')
 
         self._load_conf(
             {
@@ -42,7 +32,7 @@ class TestApplicationNode(TestApplicationProto):
                     script: {
                         "type": "external",
                         "processes": {"spare": 0},
-                        "working_directory": self.testdir + '/node',
+                        "working_directory": self.temp_dir + '/node',
                         "executable": name,
                     }
                 },
diff --git a/test/unit/applications/lang/perl.py b/test/unit/applications/lang/perl.py
index d32aca33..a27c7649 100644
--- a/test/unit/applications/lang/perl.py
+++ b/test/unit/applications/lang/perl.py
@@ -1,3 +1,4 @@
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
@@ -5,14 +6,18 @@ class TestApplicationPerl(TestApplicationProto):
     application_type = "perl"
 
     def load(self, script, name='psgi.pl', **kwargs):
-        script_path = self.current_dir + '/perl/' + script
+        script_path = option.test_dir + '/perl/' + script
+        appication_type = self.get_appication_type()
+
+        if appication_type is None:
+            appication_type = self.application_type
 
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "applications/" + script}},
                 "applications": {
                     script: {
-                        "type": self.application_type,
+                        "type": appication_type,
                         "processes": {"spare": 0},
                         "working_directory": script_path,
                         "script": script_path + '/' + name,
diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py
index e8c70c62..2d50df2e 100644
--- a/test/unit/applications/lang/php.py
+++ b/test/unit/applications/lang/php.py
@@ -1,3 +1,4 @@
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
@@ -5,14 +6,18 @@ class TestApplicationPHP(TestApplicationProto):
     application_type = "php"
 
     def load(self, script, index='index.php', **kwargs):
-        script_path = self.current_dir + '/php/' + script
+        script_path = option.test_dir + '/php/' + script
+        appication_type = self.get_appication_type()
+
+        if appication_type is None:
+            appication_type = self.application_type
 
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "applications/" + script}},
                 "applications": {
                     script: {
-                        "type": self.application_type,
+                        "type": appication_type,
                         "processes": {"spare": 0},
                         "root": script_path,
                         "working_directory": script_path,
diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py
index 91559f4b..47b95dac 100644
--- a/test/unit/applications/lang/python.py
+++ b/test/unit/applications/lang/python.py
@@ -1,20 +1,28 @@
 import os
 import shutil
+from urllib.parse import quote
 
+import pytest
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
 class TestApplicationPython(TestApplicationProto):
     application_type = "python"
+    load_module = "wsgi"
 
-    def load(self, script, name=None, **kwargs):
+    def load(self, script, name=None, module=None, **kwargs):
+        print()
         if name is None:
             name = script
 
+        if module is None:
+            module = self.load_module
+
         if script[0] == '/':
             script_path = script
         else:
-            script_path = self.current_dir + '/python/' + script
+            script_path = option.test_dir + '/python/' + script
 
         if kwargs.get('isolation') and kwargs['isolation'].get('rootfs'):
             rootfs = kwargs['isolation']['rootfs']
@@ -27,16 +35,23 @@ class TestApplicationPython(TestApplicationProto):
 
             script_path = '/app/python/' + name
 
+        appication_type = self.get_appication_type()
+
+        if appication_type is None:
+            appication_type = self.application_type
+
         self._load_conf(
             {
-                "listeners": {"*:7080": {"pass": "applications/" + name}},
+                "listeners": {
+                    "*:7080": {"pass": "applications/" + quote(name, '')}
+                },
                 "applications": {
                     name: {
-                        "type": self.application_type,
+                        "type": appication_type,
                         "processes": {"spare": 0},
                         "path": script_path,
                         "working_directory": script_path,
-                        "module": "wsgi",
+                        "module": module,
                     }
                 },
             },
diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py
index 8c8acecc..bc3cefc6 100644
--- a/test/unit/applications/lang/ruby.py
+++ b/test/unit/applications/lang/ruby.py
@@ -1,3 +1,4 @@
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
@@ -5,14 +6,18 @@ class TestApplicationRuby(TestApplicationProto):
     application_type = "ruby"
 
     def load(self, script, name='config.ru', **kwargs):
-        script_path = self.current_dir + '/ruby/' + script
+        script_path = option.test_dir + '/ruby/' + script
+        appication_type = self.get_appication_type()
+
+        if appication_type is None:
+            appication_type = self.application_type
 
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "applications/" + script}},
                 "applications": {
                     script: {
-                        "type": self.application_type,
+                        "type": appication_type,
                         "processes": {"spare": 0},
                         "working_directory": script_path,
                         "script": script_path + '/' + name,
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index 244cb5be..2f748c21 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -1,6 +1,8 @@
+import os
 import re
 import time
 
+from conftest import option
 from unit.control import TestControl
 
 
@@ -12,7 +14,7 @@ class TestApplicationProto(TestControl):
         return time.mktime(time.strptime(date, template))
 
     def search_in_log(self, pattern, name='unit.log'):
-        with open(self.testdir + '/' + name, 'r', errors='ignore') as f:
+        with open(self.temp_dir + '/' + name, 'r', errors='ignore') as f:
             return re.search(pattern, f.read())
 
     def wait_for_record(self, pattern, name='unit.log'):
@@ -26,6 +28,16 @@ class TestApplicationProto(TestControl):
 
         return found
 
+    def get_appication_type(self):
+        current_test = (
+            os.environ.get('PYTEST_CURRENT_TEST').split(':')[-1].split(' ')[0]
+        )
+
+        if current_test in option.generated_tests:
+            return option.generated_tests[current_test]
+
+        return None
+
     def _load_conf(self, conf, **kwargs):
         if 'applications' in conf:
             for app in conf['applications'].keys():
@@ -39,6 +51,4 @@ class TestApplicationProto(TestControl):
                 if 'isolation' in kwargs:
                     app_conf['isolation'] = kwargs['isolation']
 
-        self.assertIn(
-            'success', self.conf(conf), 'load application configuration'
-        )
+        assert 'success' in self.conf(conf), 'load application configuration'
diff --git a/test/unit/applications/tls.py b/test/unit/applications/tls.py
index e6a846b2..fdf681ae 100644
--- a/test/unit/applications/tls.py
+++ b/test/unit/applications/tls.py
@@ -1,40 +1,19 @@
 import os
-import re
 import ssl
 import subprocess
 
+from conftest import option
 from unit.applications.proto import TestApplicationProto
 
 
 class TestApplicationTLS(TestApplicationProto):
-    def __init__(self, test):
-        super().__init__(test)
+    def setup_method(self):
+        super().setup_method()
 
         self.context = ssl.create_default_context()
         self.context.check_hostname = False
         self.context.verify_mode = ssl.CERT_NONE
 
-    @classmethod
-    def setUpClass(cls, complete_check=True):
-        unit = super().setUpClass(complete_check=False)
-
-        # check tls module
-
-        try:
-            subprocess.check_output(['which', 'openssl'])
-
-            output = subprocess.check_output(
-                [unit.unitd, '--version'], stderr=subprocess.STDOUT
-            )
-
-            if re.search('--openssl', output.decode()):
-                cls.available['modules']['openssl'] = []
-
-        except:
-            pass
-
-        return unit if not complete_check else unit.complete()
-
     def certificate(self, name='default', load=True):
         self.openssl_conf()
 
@@ -45,9 +24,9 @@ class TestApplicationTLS(TestApplicationProto):
                 '-x509',
                 '-new',
                 '-subj',    '/CN=' + name + '/',
-                '-config',  self.testdir + '/openssl.conf',
-                '-out',     self.testdir + '/' + name + '.crt',
-                '-keyout',  self.testdir + '/' + name + '.key',
+                '-config',  self.temp_dir + '/openssl.conf',
+                '-out',     self.temp_dir + '/' + name + '.crt',
+                '-keyout',  self.temp_dir + '/' + name + '.key',
             ],
             stderr=subprocess.STDOUT,
         )
@@ -59,8 +38,8 @@ class TestApplicationTLS(TestApplicationProto):
         if key is None:
             key = crt
 
-        key_path = self.testdir + '/' + key + '.key'
-        crt_path = self.testdir + '/' + crt + '.crt'
+        key_path = self.temp_dir + '/' + key + '.key'
+        crt_path = self.temp_dir + '/' + crt + '.crt'
 
         with open(key_path, 'rb') as k, open(crt_path, 'rb') as c:
             return self.conf(k.read() + c.read(), '/certificates/' + crt)
@@ -87,7 +66,7 @@ class TestApplicationTLS(TestApplicationProto):
         return ssl.get_server_certificate(addr, ssl_version=ssl_version)
 
     def openssl_conf(self):
-        conf_path = self.testdir + '/openssl.conf'
+        conf_path = self.temp_dir + '/openssl.conf'
 
         if os.path.exists(conf_path):
             return
@@ -105,7 +84,7 @@ distinguished_name = req_distinguished_name
         if name is None:
             name = script
 
-        script_path = self.current_dir + '/python/' + script
+        script_path = option.test_dir + '/python/' + script
 
         self._load_conf(
             {
diff --git a/test/unit/applications/websockets.py b/test/unit/applications/websockets.py
index e0dd2c0d..cc720a98 100644
--- a/test/unit/applications/websockets.py
+++ b/test/unit/applications/websockets.py
@@ -2,10 +2,10 @@ import base64
 import hashlib
 import itertools
 import random
-import re
 import select
 import struct
 
+import pytest
 from unit.applications.proto import TestApplicationProto
 
 GUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
@@ -21,9 +21,6 @@ class TestApplicationWebsocket(TestApplicationProto):
     OP_PONG = 0x0A
     CLOSE_CODES = [1000, 1001, 1002, 1003, 1007, 1008, 1009, 1010, 1011]
 
-    def __init__(self, preinit=False):
-        self.preinit = preinit
-
     def key(self):
         raw_key = bytes(random.getrandbits(8) for _ in range(16))
         return base64.b64encode(raw_key).decode()
@@ -42,7 +39,7 @@ class TestApplicationWebsocket(TestApplicationProto):
                 'Upgrade': 'websocket',
                 'Connection': 'Upgrade',
                 'Sec-WebSocket-Key': key,
-                'Sec-WebSocket-Protocol': 'chat',
+                'Sec-WebSocket-Protocol': 'chat, phone, video',
                 'Sec-WebSocket-Version': 13,
             }
 
@@ -56,14 +53,11 @@ class TestApplicationWebsocket(TestApplicationProto):
         while True:
             rlist = select.select([sock], [], [], 60)[0]
             if not rlist:
-                self.fail('Can\'t read response from server.')
+                pytest.fail('Can\'t read response from server.')
 
             resp += sock.recv(4096).decode()
 
-            if (
-                re.search('101 Switching Protocols', resp)
-                and resp[-4:] == '\r\n\r\n'
-            ):
+            if (resp.startswith('HTTP/') and '\r\n\r\n' in resp):
                 resp = self._resp_to_dict(resp)
                 break
 
@@ -84,7 +78,7 @@ class TestApplicationWebsocket(TestApplicationProto):
                     # For all current cases if the "read_timeout" was changed
                     # than test do not expect to get a response from server.
                     if read_timeout == 60:
-                        self.fail('Can\'t read response from server.')
+                        pytest.fail('Can\'t read response from server.')
                     break
 
                 data += sock.recv(bytes - len(data))
@@ -130,19 +124,19 @@ class TestApplicationWebsocket(TestApplicationProto):
                 code, = struct.unpack('!H', data[:2])
                 reason = data[2:].decode('utf-8')
                 if not (code in self.CLOSE_CODES or 3000 <= code < 5000):
-                    self.fail('Invalid status code')
+                    pytest.fail('Invalid status code')
                 frame['code'] = code
                 frame['reason'] = reason
             elif length == 0:
                 frame['code'] = 1005
                 frame['reason'] = ''
             else:
-                self.fail('Close frame too short')
+                pytest.fail('Close frame too short')
 
         frame['data'] = data
 
         if frame['mask']:
-            self.fail('Received frame with mask')
+            pytest.fail('Received frame with mask')
 
         return frame