admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use check_output in test.py (#280)

Browse Source
This commit is contained in:
Alon Zakai
2019-06-17 17:11:36 -07:00
committed by GitHub
parent 87285f5e8f
commit dffb280b35
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test.py
View File

@@ -11,10 +11,8 @@ def check_call(cmd):
subprocess.check_call(cmd.split(' ')) subprocess.check_call(cmd.split(' '))
def checked_call_with_output(cmd, expected, stderr=None): def checked_call_with_output(cmd, expected, stderr=None):
proc = subprocess.Popen(cmd.split(' '), stdout=subprocess.PIPE, stderr=stderr) stdout = subprocess.check_output(cmd.split(' '), stderr=stderr)
stdout, stderr = proc.communicate() assert expected in stdout, 'call did not have the right output: ' + stdout
assert not proc.returncode, 'call must have succeeded'
assert expected in (stdout + stderr), 'call did not have the right output: ' + stdout + stderr
def failing_call_with_output(cmd, expected): def failing_call_with_output(cmd, expected):
proc = subprocess.Popen(cmd.split(' '), stdout=subprocess.PIPE) proc = subprocess.Popen(cmd.split(' '), stdout=subprocess.PIPE)
@@ -54,7 +52,7 @@ assert 'upstream' in open(os.path.expanduser('~/.emscripten')).read()
assert 'fastcomp' not in open(os.path.expanduser('~/.emscripten')).read() assert 'fastcomp' not in open(os.path.expanduser('~/.emscripten')).read()
print('verify version') print('verify version')
checked_call_with_output('upstream/emscripten/emcc -v', TAGS['latest'], stderr=subprocess.PIPE) checked_call_with_output('upstream/emscripten/emcc -v', TAGS['latest'], stderr=subprocess.STDOUT)
print('test tot-upstream') print('test tot-upstream')
check_call('./emsdk install tot-upstream') check_call('./emsdk install tot-upstream')