Unverified Commit 896e44a8 authored by Michele Guerini Rocco's avatar Michele Guerini Rocco Committed by GitHub
Browse files

nixosTests.systemd-initrd-networkd: handleTest -> runTest (#424076)

parents 089839cf dde4a38d

nixos/tests/all-tests.nix

+1 −1
Original line number Diff line number Diff line
@@ -1377,7 +1377,7 @@ in 
  systemd-initrd-luks-tpm2 = runTest ./systemd-initrd-luks-tpm2.nix;

  systemd-initrd-luks-unl0kr = runTest ./systemd-initrd-luks-unl0kr.nix;

  systemd-initrd-modprobe = runTest ./systemd-initrd-modprobe.nix;

  systemd-initrd-networkd = handleTest ./systemd-initrd-networkd.nix { };

  systemd-initrd-networkd = import ./systemd-initrd-networkd.nix { inherit runTest; };

  systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix;

  systemd-initrd-networkd-openvpn = handleTestOn [

    "x86_64-linux"

nixos/tests/systemd-initrd-networkd.nix

+75 −75
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

  pkgs ? import ../.. { inherit system config; },

  lib ? pkgs.lib,

}:



with import ../lib/testing-python.nix { inherit system pkgs; };

{ runTest }:



let

  inherit (lib.maintainers) elvishjerricco;



  common = {

  common =

    { pkgs, ... }:

    {

      boot.initrd.systemd = {

        enable = true;

        network.wait-online.timeout = 10;
@@ -29,11 +22,15 @@ let 


  mkFlushTest =

    flush: script:

    makeTest {

    runTest (

      { lib, ... }:

      {

        name = "systemd-initrd-network-${lib.optionalString (!flush) "no-"}flush";

      meta.maintainers = [ elvishjerricco ];

        meta.maintainers = with lib.maintainers; [ elvishjerricco ];



      nodes.machine = {

        nodes.machine =

          { pkgs, ... }:

          {

            imports = [ common ];



            boot.initrd.network.flushBeforeStage2 = flush;
@@ -67,13 +64,15 @@ let 


          machine.wait_for_unit("multi-user.target")

        '';

    };



      }

    );

in

{

  basic = makeTest {

  basic = runTest (

    { lib, ... }:

    {

      name = "systemd-initrd-network";

    meta.maintainers = [ elvishjerricco ];

      meta.maintainers = with lib.maintainers; [ elvishjerricco ];



      nodes.machine = common;
@@ -91,7 +90,8 @@ in 
        machine.succeed("ip addr show >&2")

        machine.succeed("ip route show >&2")

      '';

  };

    }

  );



  doFlush = mkFlushTest true ''

    if ip addr | grep 10.0.2.15; then