Tests: fixed unit.log print.

10 files changed, 38 insertions, 219 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 7715bd6c..518cd017 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -7,8 +7,8 @@ from unit.applications.proto import TestApplicationProto
 
 class TestApplicationGo(TestApplicationProto):
     def prepare_env(self, script, name, static=False):
-        if not os.path.exists(self.temp_dir + '/go'):
-            os.mkdir(self.temp_dir + '/go')
+        if not os.path.exists(option.temp_dir + '/go'):
+            os.mkdir(option.temp_dir + '/go')
 
         env = os.environ.copy()
         env['GOPATH'] = option.current_dir + '/build/go'
@@ -22,7 +22,7 @@ class TestApplicationGo(TestApplicationProto):
                 '-ldflags',
                 '-extldflags "-static"',
                 '-o',
-                self.temp_dir + '/go/' + name,
+                option.temp_dir + '/go/' + name,
                 option.test_dir + '/go/' + script + '/' + name + '.go',
             ]
         else:
@@ -30,7 +30,7 @@ class TestApplicationGo(TestApplicationProto):
                 'go',
                 'build',
                 '-o',
-                self.temp_dir + '/go/' + name,
+                option.temp_dir + '/go/' + name,
                 option.test_dir + '/go/' + script + '/' + name + '.go',
             ]
 
@@ -47,7 +47,7 @@ class TestApplicationGo(TestApplicationProto):
         static_build = False
 
         wdir = option.test_dir + "/go/" + script
-        executable = self.temp_dir + "/go/" + name
+        executable = option.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 01cbfa0b..a034d9a4 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -10,7 +10,7 @@ from unit.applications.proto import TestApplicationProto
 
 class TestApplicationJava(TestApplicationProto):
     def load(self, script, name='app', **kwargs):
-        app_path = self.temp_dir + '/java'
+        app_path = option.temp_dir + '/java'
         web_inf_path = app_path + '/WEB-INF/'
         classes_path = web_inf_path + 'classes/'
         script_path = option.test_dir + '/java/' + script + '/'
diff --git a/test/unit/applications/lang/node.py b/test/unit/applications/lang/node.py
index 877fc461..4aa9eb1c 100644
--- a/test/unit/applications/lang/node.py
+++ b/test/unit/applications/lang/node.py
@@ -11,17 +11,17 @@ class TestApplicationNode(TestApplicationProto):
         # copy application
 
         shutil.copytree(
-            option.test_dir + '/node/' + script, self.temp_dir + '/node'
+            option.test_dir + '/node/' + script, option.temp_dir + '/node'
         )
 
         # copy modules
 
         shutil.copytree(
             option.current_dir + '/node/node_modules',
-            self.temp_dir + '/node/node_modules',
+            option.temp_dir + '/node/node_modules',
         )
 
-        public_dir(self.temp_dir + '/node')
+        public_dir(option.temp_dir + '/node')
 
         self._load_conf(
             {
@@ -32,7 +32,7 @@ class TestApplicationNode(TestApplicationProto):
                     script: {
                         "type": "external",
                         "processes": {"spare": 0},
-                        "working_directory": self.temp_dir + '/node',
+                        "working_directory": option.temp_dir + '/node',
                         "executable": name,
                     }
                 },
diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py
index 47b95dac..a4a27bb9 100644
--- a/test/unit/applications/lang/python.py
+++ b/test/unit/applications/lang/python.py
@@ -12,7 +12,6 @@ class TestApplicationPython(TestApplicationProto):
     load_module = "wsgi"
 
     def load(self, script, name=None, module=None, **kwargs):
-        print()
         if name is None:
             name = script
 
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index 2f748c21..9a0361d5 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -14,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.temp_dir + '/' + name, 'r', errors='ignore') as f:
+        with open(option.temp_dir + '/' + name, 'r', errors='ignore') as f:
             return re.search(pattern, f.read())
 
     def wait_for_record(self, pattern, name='unit.log'):
diff --git a/test/unit/applications/tls.py b/test/unit/applications/tls.py
index fdf681ae..fb1b112c 100644
--- a/test/unit/applications/tls.py
+++ b/test/unit/applications/tls.py
@@ -8,8 +8,6 @@ from unit.applications.proto import TestApplicationProto
 
 class TestApplicationTLS(TestApplicationProto):
     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
@@ -24,9 +22,9 @@ class TestApplicationTLS(TestApplicationProto):
                 '-x509',
                 '-new',
                 '-subj',    '/CN=' + name + '/',
-                '-config',  self.temp_dir + '/openssl.conf',
-                '-out',     self.temp_dir + '/' + name + '.crt',
-                '-keyout',  self.temp_dir + '/' + name + '.key',
+                '-config',  option.temp_dir + '/openssl.conf',
+                '-out',     option.temp_dir + '/' + name + '.crt',
+                '-keyout',  option.temp_dir + '/' + name + '.key',
             ],
             stderr=subprocess.STDOUT,
         )
@@ -38,8 +36,8 @@ class TestApplicationTLS(TestApplicationProto):
         if key is None:
             key = crt
 
-        key_path = self.temp_dir + '/' + key + '.key'
-        crt_path = self.temp_dir + '/' + crt + '.crt'
+        key_path = option.temp_dir + '/' + key + '.key'
+        crt_path = option.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)
@@ -66,7 +64,7 @@ class TestApplicationTLS(TestApplicationProto):
         return ssl.get_server_certificate(addr, ssl_version=ssl_version)
 
     def openssl_conf(self):
-        conf_path = self.temp_dir + '/openssl.conf'
+        conf_path = option.temp_dir + '/openssl.conf'
 
         if os.path.exists(conf_path):
             return
diff --git a/test/unit/control.py b/test/unit/control.py
index 6fd350f4..f05aa827 100644
--- a/test/unit/control.py
+++ b/test/unit/control.py
@@ -1,5 +1,6 @@
 import json
 
+from conftest import option
 from unit.http import TestHTTP
 
 
@@ -53,7 +54,7 @@ class TestControl(TestHTTP):
         args = {
             'url': url,
             'sock_type': 'unix',
-            'addr': self.temp_dir + '/control.unit.sock',
+            'addr': option.temp_dir + '/control.unit.sock',
         }
 
         if conf is not None:
diff --git a/test/unit/feature/isolation.py b/test/unit/feature/isolation.py
index c6f6f3c0..235177ab 100644
--- a/test/unit/feature/isolation.py
+++ b/test/unit/feature/isolation.py
@@ -21,6 +21,16 @@ class TestFeatureIsolation(TestApplicationProto):
         if 'go' in available['modules']:
             module = TestApplicationGo()
 
+        elif 'python' in available['modules']:
+            module = TestApplicationPython()
+
+        elif 'php' in available['modules']:
+            module = TestApplicationPHP()
+            app = 'phpinfo'
+
+        elif 'ruby' in available['modules']:
+            module = TestApplicationRuby()
+
         elif 'java' in available['modules']:
             module = TestApplicationJava()
 
@@ -32,16 +42,6 @@ class TestFeatureIsolation(TestApplicationProto):
             module = TestApplicationPerl()
             app = 'body_empty'
 
-        elif 'php' in available['modules']:
-            module = TestApplicationPHP()
-            app = 'phpinfo'
-
-        elif 'python' in available['modules']:
-            module = TestApplicationPython()
-
-        elif 'ruby' in available['modules']:
-            module = TestApplicationRuby()
-
         if not module:
             return
 
diff --git a/test/unit/http.py b/test/unit/http.py
index 7845f9a8..5f073439 100644
--- a/test/unit/http.py
+++ b/test/unit/http.py
@@ -5,7 +5,6 @@ import os
 import re
 import select
 import socket
-import time
 
 import pytest
 from conftest import option
@@ -283,23 +282,6 @@ class TestHTTP(TestUnit):
     def getjson(self, **kwargs):
         return self.get(json=True, **kwargs)
 
-    def waitforsocket(self, port):
-        ret = False
-
-        for i in range(50):
-            try:
-                sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-                sock.connect(('127.0.0.1', port))
-                ret = True
-                break
-            except:
-                sock.close()
-                time.sleep(0.1)
-
-        sock.close()
-
-        assert ret, 'socket connected'
-
     def form_encode(self, fields):
         is_multipart = False
 
diff --git a/test/unit/main.py b/test/unit/main.py
index d5940995..488b3f4d 100644
--- a/test/unit/main.py
+++ b/test/unit/main.py
@@ -1,55 +1,19 @@
-import atexit
-import os
-import re
-import shutil
-import signal
-import stat
-import subprocess
-import tempfile
-import time
-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
     def setup_class(cls, complete_check=True):
-        cls.available = option.available
-        unit = TestUnit()
-
-        unit._run()
-
-        # read unit.log
-
-        for i in range(50):
-            with open(unit.temp_dir + '/unit.log', 'r') as f:
-                log = f.read()
-                m = re.search('controller started', log)
-
-                if m is None:
-                    time.sleep(0.1)
-                else:
-                    break
-
-        if m is None:
-            _print_log(path=unit.temp_dir + '/unit.log')
-            exit("Unit is writing log too long")
-
-        def check(available, prerequisites):
+        def check():
             missed = []
 
             # check modules
 
-            if 'modules' in prerequisites:
-                available_modules = list(available['modules'].keys())
+            if 'modules' in cls.prerequisites:
+                available_modules = list(option.available['modules'].keys())
 
-                for module in prerequisites['modules']:
+                for module in cls.prerequisites['modules']:
                     if module in available_modules:
                         continue
 
@@ -60,10 +24,10 @@ class TestUnit():
 
             # check features
 
-            if 'features' in prerequisites:
-                available_features = list(available['features'].keys())
+            if 'features' in cls.prerequisites:
+                available_features = list(option.available['features'].keys())
 
-                for feature in prerequisites['features']:
+                for feature in cls.prerequisites['features']:
                     if feature in available_features:
                         continue
 
@@ -72,132 +36,7 @@ class TestUnit():
             if missed:
                 pytest.skip(', '.join(missed) + ' feature(s) not supported')
 
-        def destroy():
-            unit.stop()
-            _check_alerts(log)
-            shutil.rmtree(unit.temp_dir)
-
-        def complete():
-            destroy()
-            check(cls.available, cls.prerequisites)
-
         if complete_check:
-            complete()
-        else:
-            unit.complete = complete
-            return unit
-
-    def setup_method(self):
-        self._run()
-
-    def _run(self):
-        build_dir = option.current_dir + '/build'
-        self.unitd = build_dir + '/unitd'
-
-        if not os.path.isfile(self.unitd):
-            exit("Could not find unit")
-
-        self.temp_dir = tempfile.mkdtemp(prefix='unit-test-')
-
-        public_dir(self.temp_dir)
-
-        if oct(stat.S_IMODE(os.stat(build_dir).st_mode)) != '0o777':
-            public_dir(build_dir)
-
-        os.mkdir(self.temp_dir + '/state')
-
-        with open(self.temp_dir + '/unit.log', 'w') as log:
-            self._p = subprocess.Popen(
-                [
-                    self.unitd,
-                    '--no-daemon',
-                    '--modules',  build_dir,
-                    '--state',    self.temp_dir + '/state',
-                    '--pid',      self.temp_dir + '/unit.pid',
-                    '--log',      self.temp_dir + '/unit.log',
-                    '--control',  'unix:' + self.temp_dir + '/control.unit.sock',
-                    '--tmp',      self.temp_dir,
-                ],
-                stderr=log,
-            )
-
-        atexit.register(self.stop)
-
-        if not waitforfiles(self.temp_dir + '/control.unit.sock'):
-            _print_log(path=self.temp_dir + '/unit.log')
-            exit("Could not start unit")
-
-        self._started = True
-
-    def teardown_method(self):
-        self.stop()
-
-        # check unit.log for alerts
-
-        unit_log = self.temp_dir + '/unit.log'
-
-        with open(unit_log, 'r', encoding='utf-8', errors='ignore') as f:
-            _check_alerts(f.read())
-
-        # remove unit.log
-
-        if not option.save_log:
-            shutil.rmtree(self.temp_dir)
+            check()
         else:
-            _print_log(path=self.temp_dir)
-
-        assert self.stop_errors == [None, None], 'stop errors'
-
-    def stop(self):
-        if not self._started:
-            return
-
-        self.stop_errors = []
-
-        self.stop_errors.append(self._stop())
-
-        self.stop_errors.append(self.stop_processes())
-
-        atexit.unregister(self.stop)
-
-        self._started = False
-
-    def _stop(self):
-        if self._p.poll() is not None:
-            return
-
-        with self._p as p:
-            p.send_signal(signal.SIGQUIT)
-
-            try:
-                retcode = p.wait(15)
-                if retcode:
-                    return 'Child process terminated with code ' + str(retcode)
-            except:
-                p.kill()
-                return 'Could not terminate unit'
-
-    def run_process(self, target, *args):
-        if not hasattr(self, '_processes'):
-            self._processes = []
-
-        process = Process(target=target, args=args)
-        process.start()
-
-        self._processes.append(process)
-
-    def stop_processes(self):
-        if not hasattr(self, '_processes'):
-            return
-
-        fail = False
-        for process in self._processes:
-            if process.is_alive():
-                process.terminate()
-                process.join(timeout=15)
-
-                if process.is_alive():
-                    fail = True
-
-        if fail:
-            return 'Fail to stop process'
+            return check