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

nixos/testing: Fix fail() function 

The docs say this behaves as succeed(), but it does not return stdout as
succeed() does. This fixes that behaviour
This commit is contained in:
Janne Heß 2020-08-21 21:28:24 +02:00
parent a02b4af726
commit ff03800d3b
No known key found for this signature in database
GPG Key ID: 69165158F05265DF
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -424,15 +424,18 @@ class Machine:
output += out output += out
return output return output
def fail(self, *commands: str) -> None: def fail(self, *commands: str) -> str:
"""Execute each command and check that it fails.""" """Execute each command and check that it fails."""
output = ""
for command in commands: for command in commands:
with self.nested("must fail: {}".format(command)): with self.nested("must fail: {}".format(command)):
status, output = self.execute(command) (status, out) = self.execute(command)
if status == 0: if status == 0:
raise Exception( raise Exception(
"command `{}` unexpectedly succeeded".format(command) "command `{}` unexpectedly succeeded".format(command)
) )
output += out
return output
def wait_until_succeeds(self, command: str) -> str: def wait_until_succeeds(self, command: str) -> str:
"""Wait until a command returns success and return its output. """Wait until a command returns success and return its output.