Merged with the default branch.1.16.0-1

3 files changed, 7 insertions, 6 deletions

diff --git a/test/unit/applications/lang/go.py b/test/unit/applications/lang/go.py
index 7212a95c..e0f83c0a 100644
--- a/test/unit/applications/lang/go.py
+++ b/test/unit/applications/lang/go.py
@@ -1,5 +1,5 @@
 import os
-from subprocess import Popen
+import subprocess
 from unit.applications.proto import TestApplicationProto
 
 
@@ -26,7 +26,7 @@ class TestApplicationGo(TestApplicationProto):
         env['GOPATH'] = self.pardir + '/build/go'
 
         try:
-            process = Popen(
+            process = subprocess.Popen(
                 [
                     'go',
                     'build',
@@ -35,6 +35,7 @@ class TestApplicationGo(TestApplicationProto):
                     self.current_dir + '/go/' + script + '/' + name + '.go',
                 ],
                 env=env,
+                stderr=subprocess.STDOUT,
             )
 
             process.communicate()
diff --git a/test/unit/applications/lang/java.py b/test/unit/applications/lang/java.py
index a370d96b..a8a09ce5 100644
--- a/test/unit/applications/lang/java.py
+++ b/test/unit/applications/lang/java.py
@@ -1,7 +1,7 @@
 import os
 import glob
 import shutil
-from subprocess import Popen
+import subprocess
 from unit.applications.proto import TestApplicationProto
 
 
@@ -64,7 +64,7 @@ class TestApplicationJava(TestApplicationProto):
             javac.extend(src)
 
             try:
-                process = Popen(javac)
+                process = subprocess.Popen(javac, stderr=subprocess.STDOUT)
                 process.communicate()
 
             except:
diff --git a/test/unit/applications/lang/php.py b/test/unit/applications/lang/php.py
index 6b1677e6..e8c70c62 100644
--- a/test/unit/applications/lang/php.py
+++ b/test/unit/applications/lang/php.py
@@ -4,7 +4,7 @@ from unit.applications.proto import TestApplicationProto
 class TestApplicationPHP(TestApplicationProto):
     application_type = "php"
 
-    def load(self, script, name='index.php', **kwargs):
+    def load(self, script, index='index.php', **kwargs):
         script_path = self.current_dir + '/php/' + script
 
         self._load_conf(
@@ -16,7 +16,7 @@ class TestApplicationPHP(TestApplicationProto):
                         "processes": {"spare": 0},
                         "root": script_path,
                         "working_directory": script_path,
-                        "index": name,
+                        "index": index,
                     }
                 },
             },