Commit 65bc98e4 authored by Maximilian Bosch's avatar Maximilian Bosch Committed by Jörg Thalheim
Browse files

nixos/tests: fix eval of several tests 

The addition of the nspawn backend introduced a second argument passed
to the attribute-set passed to `testScript`, i.e. containers[1].

Note: this is by no means intended to replace the compat fix from #501599,
I believe we shouldn't have deprecated invocations in-tree at all, hence
the change on this end.

This is intended to only fix address the fallout from #478109,
`nixosTests.parsedmarc` fails due to some postfix module changes to
evaluate and the test of `peering-manasger` still seems broken.

[1] https://github.com/NixOS/nixpkgs/pull/478109
parent 6de78093

nixos/tests/discourse.nix

+1 −1
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ in 
    };



  testScript =

    { nodes }:

    { nodes, ... }:

    let

      request = builtins.toJSON {

        title = "Private message";

nixos/tests/drbd.nix

+27 −29
Original line number Diff line number Diff line
@@ -54,9 +54,7 @@ in 
  nodes.drbd1 = drbdConfig;

  nodes.drbd2 = drbdConfig;



  testScript =

    { nodes }:

    ''

  testScript = ''

    drbd1.start()

    drbd2.start()

nixos/tests/munge.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
    };



  testScript =

    { nodes }:

    { nodes, ... }:

    let

      aliceUid = toString nodes.machine.users.users.alice.uid;

    in

nixos/tests/nixops/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ let 
      };



      testScript =

        { nodes }:

        { nodes, ... }:

        let

          deployerSetup = pkgs.writeScript "deployerSetup" ''

            #!${pkgs.runtimeShell}

nixos/tests/parsedmarc/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ in 
      };



    testScript =

      { nodes }:

      { nodes, ... }:

      let

        esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;

        valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";
@@ -202,7 +202,7 @@ in 
      };



      testScript =

        { nodes }:

        { nodes, ... }:

        let

          esPort = toString nodes.parsedmarc.config.services.elasticsearch.port;

          valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value";