diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:11 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-02-05 19:18:35 +0100 |
| commit | 0be87c79797a5fa384fbc356c74ed54f9f7829ea (patch) | |
| tree | 69e2f87d4a1ec8f8962d35e330188afcf8f88dcb /nixos/tests/lorri | |
| parent | ac241fb7a570d6cf81d229ad22a8889602639160 (diff) | |
Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master. This should get us back to 87a19e9048773d5a363679617406ad148d36c3b8. This reverts commit ac241fb7a570d6cf81d229ad22a8889602639160, reversing changes made to 76a439239eb310d9ad76d998b34d5d3bc0e37acb.
Diffstat (limited to 'nixos/tests/lorri')
| -rw-r--r-- | nixos/tests/lorri/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/lorri/default.nix b/nixos/tests/lorri/default.nix index 198171082d880..53074385a652d 100644 --- a/nixos/tests/lorri/default.nix +++ b/nixos/tests/lorri/default.nix @@ -15,12 +15,12 @@ import ../make-test-python.nix { # Start the daemon and wait until it is ready machine.execute("lorri daemon > lorri.stdout 2> lorri.stderr &") - machine.wait_until_succeeds("grep --fixed-strings 'ready' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'lorri: ready' lorri.stdout") # Ping the daemon - machine.succeed("lorri internal__ping shell.nix") + machine.execute("lorri ping_ $(readlink -f shell.nix)") # Wait for the daemon to finish the build - machine.wait_until_succeeds("grep --fixed-strings 'Completed' lorri.stdout") + machine.wait_until_succeeds("grep --fixed-strings 'OutputPaths' lorri.stdout") ''; } |