Merged with the default branch.1.26.0-1

7 files changed, 35 insertions, 23 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 6be1667b..367059e6 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -40,13 +40,12 @@ class TestApplicationGo(TestApplicationProto):
             print("\n$ GOPATH=" + env['GOPATH'] + " " + " ".join(args))
 
         try:
-            process = subprocess.Popen(args, env=env)
-            process.communicate()
+            process = subprocess.run(args, env=env)
 
         except KeyboardInterrupt:
             raise
 
-        except:
+        except subprocess.CalledProcessError:
             return None
 
         return process
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index 53b27b07..50998978 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -64,10 +64,17 @@ class TestApplicationJava(TestApplicationProto):
 
             javac = [
                 'javac',
-                '-target', '8', '-source', '8', '-nowarn',
-                '-encoding',   'utf-8',
-                '-d',          classes_path,
-                '-classpath',  classpath + ':' + ws_jars[0],
+                '-target',
+                '8',
+                '-source',
+                '8',
+                '-nowarn',
+                '-encoding',
+                'utf-8',
+                '-d',
+                classes_path,
+                '-classpath',
+                classpath + ':' + ws_jars[0],
             ]
             javac.extend(src)
 
@@ -75,13 +82,12 @@ class TestApplicationJava(TestApplicationProto):
                 print("\n$ " + " ".join(javac))
 
             try:
-                process = subprocess.Popen(javac, stderr=subprocess.STDOUT)
-                process.communicate()
+                subprocess.check_output(javac, stderr=subprocess.STDOUT)
 
             except KeyboardInterrupt:
                 raise
 
-            except:
+            except subprocess.CalledProcessError:
                 pytest.fail('Can\'t run javac process.')
 
     def load(self, script, **kwargs):
diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py
index 90c0078c..5319d2ca 100644
--- a/test/unit/applications/lang/php.py
+++ b/test/unit/applications/lang/php.py
@@ -22,18 +22,27 @@ class TestApplicationPHP(TestApplicationProto):
 
             script_path = '/app/php/' + script
 
+        app = {
+            "type": self.get_application_type(),
+            "processes": kwargs.pop('processes', {"spare": 0}),
+            "root": script_path,
+            "working_directory": script_path,
+            "index": index,
+        }
+
+        for attr in (
+            'environment',
+            'limits',
+            'options',
+            'targets',
+        ):
+            if attr in kwargs:
+                app[attr] = kwargs.pop(attr)
+
         self._load_conf(
             {
                 "listeners": {"*:7080": {"pass": "applications/" + script}},
-                "applications": {
-                    script: {
-                        "type": self.get_application_type(),
-                        "processes": {"spare": 0},
-                        "root": script_path,
-                        "working_directory": script_path,
-                        "index": index,
-                    }
-                },
+                "applications": {script: app},
             },
             **kwargs
         )
diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py
index 215aa332..1e38f3fa 100644
--- a/test/unit/applications/lang/python.py
+++ b/test/unit/applications/lang/python.py
@@ -2,7 +2,6 @@ import os
 import shutil
 from urllib.parse import quote
 
-import pytest
 from unit.applications.proto import TestApplicationProto
 from unit.option import option
 
diff --git a/test/unit/applications/lang/ruby.py b/test/unit/applications/lang/ruby.py
index 61d50558..824bfe7f 100644
--- a/test/unit/applications/lang/ruby.py
+++ b/test/unit/applications/lang/ruby.py
@@ -1,4 +1,3 @@
-import os
 import shutil
 
 from unit.applications.proto import TestApplicationProto
diff --git a/test/unit/applications/proto.py b/test/unit/applications/proto.py
index e30d21ff..cd8672ba 100644
--- a/test/unit/applications/proto.py
+++ b/test/unit/applications/proto.py
@@ -3,8 +3,8 @@ import re
 import time
 
 from unit.control import TestControl
-from unit.option import option
 from unit.log import Log
+from unit.option import option
 
 
 class TestApplicationProto(TestControl):
diff --git a/test/unit/applications/tls.py b/test/unit/applications/tls.py
index 583b618f..c7254235 100644
--- a/test/unit/applications/tls.py
+++ b/test/unit/applications/tls.py
@@ -15,7 +15,7 @@ class TestApplicationTLS(TestApplicationProto):
     def certificate(self, name='default', load=True):
         self.openssl_conf()
 
-        subprocess.call(
+        subprocess.check_output(
             [
                 'openssl',
                 'req',