Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f8948e960691
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 0923ffb2f64c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 6, 2019

  1. nixos/tests: Ignore shutdown/crash if not booted 

    Condition seems to be inverted. Crash and shutdown only make sense, when
the machine is booted; i.e. we return immediately otherwise.
In the Perl test driver this is:

    return unless $self->{booted};
    @JohnAZoidberg
    JohnAZoidberg committed Nov 6, 2019
    Copy the full SHA
    afbfef9 View commit details

  2. Merge pull request #72899 from JohnAZoidberg/fix-py-test-driver-crash 

    nixos/tests: Ignore shutdown/crash if not booted
    @worldofpeace
    worldofpeace authored Nov 6, 2019
    Copy the full SHA
    0923ffb View commit details
Showing with 2 additions and 2 deletions.
  1. +2 −2 nixos/lib/test-driver/test-driver.py
4 changes: 2 additions & 2 deletions nixos/lib/test-driver/test-driver.py
View file
Original file line number Diff line number Diff line change
@@ -611,14 +611,14 @@ def process_serial_output():
self.log("QEMU running (pid {})".format(self.pid))

def shutdown(self):
if self.booted:
if not self.booted:
return

self.shell.send("poweroff\n".encode())
self.wait_for_shutdown()

def crash(self):
if self.booted:
if not self.booted:
return

self.log("forced crash")