Merged with the default branch.1.26.0-1

2 files changed, 5 insertions, 5 deletions

diff --git a/test/unit/check/go.py b/test/unit/check/go.py
index 309091c0..cc17f0fe 100644
--- a/test/unit/check/go.py
+++ b/test/unit/check/go.py
@@ -11,7 +11,7 @@ def check_go(current_dir, temp_dir, test_dir):
     env['GO111MODULE'] = 'auto'
 
     try:
-        process = subprocess.Popen(
+        process = subprocess.run(
             [
                 'go',
                 'build',
@@ -20,8 +20,9 @@ def check_go(current_dir, temp_dir, test_dir):
                 test_dir + '/go/empty/app.go',
             ],
             env=env,
+            stderr=subprocess.STDOUT,
+            stdout=subprocess.PIPE,
         )
-        process.communicate()
 
         if process.returncode == 0:
             return True
@@ -29,5 +30,5 @@ def check_go(current_dir, temp_dir, test_dir):
     except KeyboardInterrupt:
         raise
 
-    except:
+    except subprocess.CalledProcessError:
         return None
diff --git a/test/unit/check/isolation.py b/test/unit/check/isolation.py
index 43c8842f..9bd835a3 100644
--- a/test/unit/check/isolation.py
+++ b/test/unit/check/isolation.py
@@ -3,9 +3,8 @@ import os
 
 from unit.applications.lang.go import TestApplicationGo
 from unit.applications.lang.java import TestApplicationJava
-from unit.applications.lang.ruby import TestApplicationRuby
 from unit.applications.lang.node import TestApplicationNode
-from unit.applications.proto import TestApplicationProto
+from unit.applications.lang.ruby import TestApplicationRuby
 from unit.http import TestHTTP
 from unit.option import option
 from unit.utils import getns