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: d7d0ccd22247
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 2393fa23f236
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Dec 27, 2019

  1. nixosTests.kexec: port to python. 

    The test did not succeed for me before this commit
(the Perl test hung forever), and this translation exhibits
the same problem.
    @nh2
    nh2 committed Dec 27, 2019
    Copy the full SHA
    12e3503 View commit details

Commits on Jan 1, 2020

  1. Merge pull request #76560 from nh2/kexec-test-python 

    nixosTests.kexec: port to python and mark as broken
    @flokli
    flokli authored Jan 1, 2020
    Copy the full SHA
    2393fa2 View commit details
Showing with 12 additions and 6 deletions.
  1. +12 −6 nixos/tests/kexec.nix
18 changes: 12 additions & 6 deletions nixos/tests/kexec.nix
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
# Test whether fast reboots via kexec work.

import ./make-test.nix ({ pkgs, ...} : {
import ./make-test-python.nix ({ pkgs, lib, ...} : {
name = "kexec";
meta = with pkgs.stdenv.lib.maintainers; {
meta = with lib.maintainers; {
maintainers = [ eelco ];
# Currently hangs forever; last output is:
# machine # [ 10.239914] dhcpcd[707]: eth0: adding default route via fe80::2
# machine: waiting for the VM to finish booting
# machine # Cannot find the ESP partition mount point.
# machine # [ 28.681197] nscd[692]: 692 checking for monitored file `/etc/netgroup': No such file or directory
broken = true;
};

machine = { ... }:
{ virtualisation.vlans = [ ]; };

testScript =
''
$machine->waitForUnit("multi-user.target");
$machine->execute("systemctl kexec &");
$machine->{connected} = 0;
$machine->waitForUnit("multi-user.target");
machine.wait_for_unit("multi-user.target")
machine.execute("systemctl kexec &")
machine.connected = False
machine.wait_for_unit("multi-user.target")
'';
})