nixosTests.varnish{75,76,60}: migrate to runTest (NixOS#394659)

Author: GaetanLepage

nixos/tests/all-tests.nix

@@ -1277,9 +1277,18 @@ in {
   ustreamer = handleTest ./ustreamer.nix {};
   uwsgi = handleTest ./uwsgi.nix {};
   v2ray = handleTest ./v2ray.nix {};
-  varnish60 = handleTest ./varnish.nix { package = pkgs.varnish60; };
-  varnish75 = handleTest ./varnish.nix { package = pkgs.varnish75; };
-  varnish76 = handleTest ./varnish.nix { package = pkgs.varnish76; };
+  varnish60 = runTest {
+    imports = [ ./varnish.nix ];
+    _module.args.package = pkgs.varnish60;
+  };
+  varnish75 = runTest {
+    imports = [ ./varnish.nix ];
+    _module.args.package = pkgs.varnish75;
+  };
+  varnish76 = runTest {
+    imports = [ ./varnish.nix ];
+    _module.args.package = pkgs.varnish76;
+  };
   vault = handleTest ./vault.nix {};
   vault-agent = handleTest ./vault-agent.nix {};
   vault-dev = handleTest ./vault-dev.nix {};

nixos/tests/varnish.nix

@@ -1,67 +1,60 @@
+{ pkgs, package, ... }:
+let
+  testPath = pkgs.hello;
+in
 {
-  system ? builtins.currentSystem,
-  pkgs ? import ../.. { inherit system; },
-  package,
-}:
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  let
-    testPath = pkgs.hello;
-  in
-  {
-    name = "varnish";
-    meta = {
-      maintainers = [ ];
-    };
-
-    nodes = {
-      varnish =
-        { config, pkgs, ... }:
-        {
-          services.nix-serve = {
-            enable = true;
-          };
-
-          services.varnish = {
-            inherit package;
-            enable = true;
-            http_address = "0.0.0.0:80";
-            config = ''
-              vcl 4.0;
-
-              backend nix-serve {
-                .host = "127.0.0.1";
-                .port = "${toString config.services.nix-serve.port}";
-              }
-            '';
-          };
+  name = "varnish";
+  meta = {
+    maintainers = [ ];
+  };
+
+  nodes = {
+    varnish =
+      { config, pkgs, ... }:
+      {
+        services.nix-serve = {
+          enable = true;
+        };
 
-          networking.firewall.allowedTCPPorts = [ 80 ];
-          system.extraDependencies = [ testPath ];
+        services.varnish = {
+          inherit package;
+          enable = true;
+          http_address = "0.0.0.0:80";
+          config = ''
+            vcl 4.0;
+
+            backend nix-serve {
+              .host = "127.0.0.1";
+              .port = "${toString config.services.nix-serve.port}";
+            }
+          '';
         };
 
-      client =
-        { lib, ... }:
-        {
-          nix.settings = {
-            require-sigs = false;
-            substituters = lib.mkForce [ "http://varnish" ];
-          };
+        networking.firewall.allowedTCPPorts = [ 80 ];
+        system.extraDependencies = [ testPath ];
+      };
+
+    client =
+      { lib, ... }:
+      {
+        nix.settings = {
+          require-sigs = false;
+          substituters = lib.mkForce [ "http://varnish" ];
         };
-    };
+      };
+  };
 
-    testScript = ''
-      start_all()
-      varnish.wait_for_open_port(80)
+  testScript = ''
+    start_all()
+    varnish.wait_for_open_port(80)
 
-      client.wait_until_succeeds("curl -f http://varnish/nix-cache-info");
+    client.wait_until_succeeds("curl -f http://varnish/nix-cache-info");
 
-      client.wait_until_succeeds("nix-store -r ${testPath}")
-      client.succeed("${testPath}/bin/hello")
+    client.wait_until_succeeds("nix-store -r ${testPath}")
+    client.succeed("${testPath}/bin/hello")
 
-      output = varnish.succeed("varnishadm status")
-      print(output)
-      assert "Child in state running" in output, "Unexpected varnishadm response"
-    '';
-  }
-)
+    output = varnish.succeed("varnishadm status")
+    print(output)
+    assert "Child in state running" in output, "Unexpected varnishadm response"
+  '';
+}