Tests: refactored working with processes.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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):
|
||||
|
||||
@@ -15,7 +15,7 @@ class TestApplicationTLS(TestApplicationProto):
|
||||
def certificate(self, name='default', load=True):
|
||||
self.openssl_conf()
|
||||
|
||||
subprocess.call(
|
||||
subprocess.check_output(
|
||||
[
|
||||
'openssl',
|
||||
'req',
|
||||
|
||||
Reference in New Issue
Block a user