summaryrefslogtreecommitdiffhomepage
path: root/test/unit/applications
diff options
context:
space:
mode:
authorAndrei Zeliankou <zelenkov@nginx.com>2021-11-15 12:13:54 +0000
committerAndrei Zeliankou <zelenkov@nginx.com>2021-11-15 12:13:54 +0000
commitae035852385032cc6c502c0e560fc682cacdbf34 (patch)
tree1f2ce0debba13e7cf2589a432638c65c38bc607d /test/unit/applications
parent28eaf9d37842a5d79d8081cc14fbf4cc7e7d49a5 (diff)
downloadunit-ae035852385032cc6c502c0e560fc682cacdbf34.tar.gz
unit-ae035852385032cc6c502c0e560fc682cacdbf34.tar.bz2
Tests: refactored working with processes.
Diffstat (limited to 'test/unit/applications')
-rw-r--r--test/unit/applications/lang/go.py5
-rw-r--r--test/unit/applications/lang/java.py20
-rw-r--r--test/unit/applications/tls.py2
3 files changed, 16 insertions, 11 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/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',