From ae035852385032cc6c502c0e560fc682cacdbf34 Mon Sep 17 00:00:00 2001
From: Andrei Zeliankou <zelenkov@nginx.com>
Date: Mon, 15 Nov 2021 12:13:54 +0000
Subject: Tests: refactored working with processes.

---
 test/unit/applications/lang/go.py   |  5 ++---
 test/unit/applications/lang/java.py | 20 +++++++++++++-------
 test/unit/applications/tls.py       |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'test/unit/applications')

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/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',
-- 
cgit