Merged with the default branch.

4 files changed, 7 insertions, 5 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 3db955f3..14e76362 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -67,7 +67,9 @@ replace unit.nginx.org/go => {replace_path}
             print("\n$ GOPATH=" + env['GOPATH'] + " " + " ".join(args))
 
         try:
-            process = subprocess.run(args, env=env, cwd=temp_dir)
+            output = subprocess.check_output(
+                args, env=env, cwd=temp_dir, stderr=subprocess.STDOUT
+            )
 
         except KeyboardInterrupt:
             raise
@@ -75,7 +77,7 @@ replace unit.nginx.org/go => {replace_path}
         except subprocess.CalledProcessError:
             return None
 
-        return process
+        return output
 
     def load(self, script, name='app', **kwargs):
         static_build = False
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index 50998978..c8936274 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -52,7 +52,7 @@ class TestApplicationJava(TestApplicationProto):
                 os.makedirs(classes_path)
 
             classpath = (
-                option.current_dir + '/build/tomcat-servlet-api-9.0.52.jar'
+                option.current_dir + '/build/tomcat-servlet-api-9.0.70.jar'
             )
 
             ws_jars = glob.glob(
diff --git a/test/unit/applications/lang/python.py b/test/unit/applications/lang/python.py
index 1e38f3fa..3768cf07 100644
--- a/test/unit/applications/lang/python.py
+++ b/test/unit/applications/lang/python.py
@@ -50,6 +50,7 @@ class TestApplicationPython(TestApplicationProto):
             'protocol',
             'targets',
             'threads',
+            'prefix',
         ):
             if attr in kwargs:
                 app[attr] = kwargs.pop(attr)
diff --git a/test/unit/applications/websockets.py b/test/unit/applications/websockets.py
index d647ce9b..15f212ff 100644
--- a/test/unit/applications/websockets.py
+++ b/test/unit/applications/websockets.py
@@ -43,10 +43,9 @@ class TestApplicationWebsocket(TestApplicationProto):
                 'Sec-WebSocket-Version': 13,
             }
 
-        _, sock = self.get(
+        sock = self.get(
             headers=headers,
             no_recv=True,
-            start=True,
         )
 
         resp = ''