public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #73189 from flokli/python-tests-return-multiple

Browse Source 
nixos/tests: fix succeed() with multiple commands
This commit is contained in:
Jörg Thalheim 2019-11-11 13:48:45 +00:00 committed by GitHub
commit 556a169f14
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
nixos/lib/test-driver/test-driver.py
View File

@ -381,14 +381,16 @@ class Machine:
def succeed(self, *commands): def succeed(self, *commands):
"""Execute each command and check that it succeeds.""" """Execute each command and check that it succeeds."""
output = ""
for command in commands: for command in commands:
with self.nested("must succeed: {}".format(command)): with self.nested("must succeed: {}".format(command)):
status, output = self.execute(command) (status, out) = self.execute(command)
if status != 0: if status != 0:
self.log("output: {}".format(output)) self.log("output: {}".format(out))
raise Exception( raise Exception(
"command `{}` failed (exit code {})".format(command, status) "command `{}` failed (exit code {})".format(command, status)
) )
output += out
return output return output
def fail(self, *commands): def fail(self, *commands):