tests: Refactor to unify tests and avoid duplicated code

8 files changed, 116 insertions, 393 deletions

diff --git a/tests/by-name/at/atuin-sync/test.nix b/tests/by-name/at/atuin-sync/test.nix
index 0f2cd24..627e89e 100644
--- a/tests/by-name/at/atuin-sync/test.nix
+++ b/tests/by-name/at/atuin-sync/test.nix
@@ -7,63 +7,26 @@
   extraModules,
   nixLib,
   turtle,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs;
+vhack.runTest {
   name = "atuin-sync";
-
-  node = {
-    specialArgs = {inherit pkgsUnstable vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
+  serverDomains = [
+    {
+      server = "atuin-sync.server";
+    }
+  ];
 
   nodes = let
     atuinSession = "01969ec6b8d07e30a9d2df0911fbfe2a";
     atuin = turtle.packages."${pkgs.stdenv.hostPlatform.system}".default;
   in {
-    acme = {
-      imports = [
-        ../../../common/acme/server.nix
-        ../../../common/dns/client.nix
-      ];
-    };
-    name_server = {nodes, ...}: {
-      imports =
-        extraModules
-        ++ [
-          ../../../common/acme/client.nix
-          ../../../common/dns/server.nix
-        ];
-
-      vhack.dns.zones = {
-        "atuin-sync.server" = {
-          SOA = {
-            nameServer = "ns";
-            adminEmail = "admin@server.com";
-            serial = 2025012301;
-          };
-          useOrigin = false;
-
-          A = [
-            nodes.server.networking.primaryIPAddress
-          ];
-          AAAA = [
-            nodes.server.networking.primaryIPv6Address
-          ];
-        };
-      };
-    };
-
     server = {config, ...}: {
       imports =
         extraModules
         ++ [
           ../../../../modules
-          ../../../common/acme/client.nix
-          ../../../common/dns/client.nix
         ];
 
       vhack = {
@@ -77,11 +40,6 @@ nixos-lib.runTest {
     };
 
     client1 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.sessionVariables.ATUIN_SESSION = atuinSession;
 
       environment.systemPackages = [
@@ -90,11 +48,6 @@ nixos-lib.runTest {
       ];
     };
     client2 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.sessionVariables.ATUIN_SESSION = atuinSession;
 
       environment.systemPackages = [
@@ -104,6 +57,10 @@ nixos-lib.runTest {
     };
   };
 
+  services = [
+    {server = "turtle.service";}
+  ];
+
   testScript = {nodes, ...}: let
     mkSyncConfig = pkgs.writeShellScript "register-atuin-sync-account" ''
       mkdir --parents ~/.config/atuin/
@@ -136,13 +93,9 @@ nixos-lib.runTest {
 
       run_and_record_in_atuin "$@"
     '';
-
-    acme = import ../../../common/acme {inherit pkgs;};
   in
-    acme.prepare ["server" "client1" "client2"]
     # Python
     ''
-      server.wait_for_unit("turtle.service")
       server.wait_for_open_port(443)
 
       # Wait for the server to acquire the acme certificate
diff --git a/tests/by-name/ba/back/test.nix b/tests/by-name/ba/back/test.nix
index 41d6c8e..d8adedb 100644
--- a/tests/by-name/ba/back/test.nix
+++ b/tests/by-name/ba/back/test.nix
@@ -1,11 +1,7 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
   pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }: let
   domain = "server";
@@ -22,17 +18,14 @@
       option user-configs = cgit\.owner cgit\.desc cgit\.section cgit\.homepage
   '';
 in
-  nixos-lib.runTest {
-    hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
+  vhack.runTest {
     name = "back";
 
-    node = {
-      specialArgs = {inherit pkgsUnstable vhackPackages nixpkgs-unstable nixLib;};
 
-      # Use the nixpkgs as constructed by the `nixpkgs.*` options
-      pkgs = null;
-    };
+    serverDomains = [
+      {server = "git.${domain}";}
+      {server = "issues.${domain}";}
+    ];
 
     nodes = {
       server = {config, ...}: {
@@ -49,7 +42,6 @@ in
           openssh.enable = true;
           nginx = {
             enable = true;
-            selfsign = true;
           };
           git-server = {
             enable = true;
@@ -73,23 +65,17 @@ in
             PreferredAuthentications publickey
         '';
         users.users.alice = {isNormalUser = true;};
-        networking.hosts = {
-          "${nodes.server.networking.primaryIPAddress}" = [
-            "git.${domain}"
-            "issues.${domain}"
-            "${domain}"
-          ];
-        };
       };
     };
 
+    services = [
+      {server = "gitolite-init.service";}
+      {server = "sshd.service";}
+    ];
+
     testScript = {nodes, ...}:
-    /*
-    python
-    */
+    # Python
     ''
-      start_all()
-
       with subtest("can setup ssh keys on client"):
         client.succeed(
             "mkdir -p ~root/.ssh",
@@ -103,11 +89,8 @@ in
         )
 
       with subtest("gitolite server starts"):
-        server.wait_for_unit("gitolite-init.service")
-        server.wait_for_unit("sshd.service")
         client.succeed("ssh -n git@git.${domain} info")
 
-
       with subtest("admin can clone and configure gitolite-admin.git"):
         server.succeed("sudo -u git ${pkgs.writeShellScript "delete_main_branch_on_server" ''
         set -xe
@@ -188,10 +171,10 @@ in
         client.succeed("${pkgs.writeShellScript "curl-back" ''
         set -xe
 
-        curl --insecure --fail --show-error "https://issues.${domain}/alice/repo1/issues/?query=status:open" --output /root/issues.html
+        curl --fail --show-error "https://issues.${domain}/alice/repo1/issues/?query=status:open" --output /root/issues.html
         grep -- 'Second bug title' /root/issues.html
 
-        curl --insecure --fail --show-error "https://issues.${domain}/" --output /root/repos.html
+        curl --fail --show-error "https://issues.${domain}/" --output /root/repos.html
         grep -- 'repo' /root/repos.html
         grep -- "<No description>" /root/repos.html
         grep -- '<span class="user-name">Alice</span>' /root/repos.html
diff --git a/tests/by-name/gi/git-server/test.nix b/tests/by-name/gi/git-server/test.nix
index 4e503b6..6fc3685 100644
--- a/tests/by-name/gi/git-server/test.nix
+++ b/tests/by-name/gi/git-server/test.nix
@@ -5,6 +5,7 @@
   pkgs,
   extraModules,
   nixLib,
+  vhack,
   ...
 }: let
   sshKeys =
@@ -35,24 +36,16 @@
      option user-configs = cgit\.owner cgit\.desc cgit\.section cgit\.homepage
   '';
 
-  expectedHtmlReadme = pkgs.writeText "expectedHtmlReadme" ''
-    <h1>Alice's Repo</h1>
-  '';
   expectedMdReadme = pkgs.writeText "expectedMdReadme" ''
     # Alice's Repo
   '';
 in
-  nixos-lib.runTest {
-    hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
+  vhack.runTest {
     name = "git-server";
 
-    node = {
-      specialArgs = {inherit pkgsUnstable nixpkgs-unstable nixLib;};
-
-      # Use the nixpkgs as constructed by the `nixpkgs.*` options
-      pkgs = null;
-    };
+    serverDomains = [
+      {server = gitServerDomain;}
+    ];
 
     nodes = {
       server = {config, ...}: {
@@ -67,7 +60,6 @@ in
           openssh.enable = true;
           nginx = {
             enable = true;
-            selfsign = true;
           };
           git-server = {
             enable = true;
@@ -91,13 +83,14 @@ in
       };
     };
 
-    testScript = {nodes, ...}:
-    /*
-    python
-    */
-    ''
-      start_all()
+    services = [
+      {server = "gitolite-init.service";}
+      {server = "sshd.service";}
+    ];
 
+    testScript = {...}:
+    # Python
+    ''
       with subtest("can setup ssh keys on client"):
         client.succeed(
             "mkdir -p ~root/.ssh",
@@ -116,8 +109,6 @@ in
         )
 
       with subtest("gitolite server starts"):
-        server.wait_for_unit("gitolite-init.service")
-        server.wait_for_unit("sshd.service")
         client.succeed("ssh -n git@server info")
 
 
@@ -224,15 +215,13 @@ in
         }
       ''}")
 
+      with subtest("Bob can see alice's README"):
+        client.succeed("sudo -u bob ${pkgs.writeShellScript "bob-alice-readme" ''
+        set -xe
 
-      # He can't see the readme (FIXME:  find out why this does not work. <2024-08-13> )
-      # with subtest("Bob can see alice's README"):
-      #   client.succeed("sudo -u bob ${pkgs.writeShellScript "bob-alice-readme" ''
-        #   set -xe
-        #
-        #   curl --insecure --silent --fail --show-error 'https://server/alice/alice-project/about' > readme.html
-        #   cat readme.html
-        #   diff --side-by-side ${expectedHtmlReadme}  readme.html
-        # ''}")
+        curl --fail --show-error 'https://server/alice/alice-project/about/' > readme.html
+        grep 'alice-project - My nice project.' ./readme.html
+        grep 'My nice project.' ./readme.html
+      ''}")
     '';
   }
diff --git a/tests/by-name/ro/rocie/test.nix b/tests/by-name/ro/rocie/test.nix
index c2ba97a..1f0fccb 100644
--- a/tests/by-name/ro/rocie/test.nix
+++ b/tests/by-name/ro/rocie/test.nix
@@ -1,66 +1,21 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
-  pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
+vhack.runTest {
   name = "rocie";
 
-  node = {
-    specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
+  serverDomains = [
+    {server = "rocie.server";}
+  ];
 
   nodes = {
-    acme = {...}: {
-      imports = [
-        ../../../common/acme/server.nix
-        ../../../common/dns/client.nix
-      ];
-    };
-    name_server = {nodes, ...}: {
-      imports =
-        extraModules
-        ++ [
-          ../../../common/acme/client.nix
-          ../../../common/dns/server.nix
-        ];
-
-      vhack.dns.zones = {
-        "rocie.server" = {
-          SOA = {
-            nameServer = "ns";
-            adminEmail = "admin@server.com";
-            serial = 2025012301;
-          };
-          useOrigin = false;
-
-          A = [
-            nodes.server.networking.primaryIPAddress
-          ];
-          AAAA = [
-            nodes.server.networking.primaryIPv6Address
-          ];
-        };
-      };
-    };
-
     server = {config, ...}: {
       imports =
         extraModules
         ++ [
           ../../../../modules
-          ../../../common/acme/client.nix
-          ../../../common/dns/client.nix
         ];
 
       age.identityPaths = ["${../../../common/email/hostKey}"];
@@ -76,31 +31,17 @@ nixos-lib.runTest {
       };
     };
 
-    client = {...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-    };
+    client = {_, ...}: {};
   };
 
-  testScript = {nodes, ...}: let
-    acme = import ../../../common/acme {inherit pkgs;};
-  in
-    acme.prepare ["server" "client"]
-    # Python
-    ''
-      server.wait_for_unit("rocie.service")
-
-      with subtest("All services running"):
-        import json
-        def all_services_running(host):
-          (status, output) = host.systemctl("list-units --state=failed --plain --no-pager --output=json")
-          host_failed = json.loads(output)
-          assert len(host_failed) == 0, f"Expected zero failing services, but found: {json.dumps(host_failed, indent=4)}"
-        all_services_running(server)
+  services = [
+    {server = "rocie.service";}
+  ];
 
-      client.wait_until_succeeds("curl --verbose https://rocie.server/api/can-be-provisioned > out.file")
-      client.copy_from_vm("out.file")
-    '';
+  testScript = {...}:
+  # Python
+  ''
+    client.wait_until_succeeds("curl --verbose https://rocie.server/api/can-be-provisioned > out.file")
+    client.copy_from_vm("out.file")
+  '';
 }
diff --git a/tests/by-name/ru/rust-motd/test.nix b/tests/by-name/ru/rust-motd/test.nix
index 6623c0c..43a905d 100644
--- a/tests/by-name/ru/rust-motd/test.nix
+++ b/tests/by-name/ru/rust-motd/test.nix
@@ -1,25 +1,11 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
-  pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs;
-
+vhack.runTest {
   name = "rust-motd";
 
-  node = {
-    specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
-
   nodes = {
     server = {config, ...}: {
       imports =
@@ -34,29 +20,18 @@ nixos-lib.runTest {
     };
   };
 
+  services = [
+    {
+      server = "rust-motd.service";
+      start = true;
+    }
+  ];
+
   testScript = {nodes, ...}:
-  /*
-  python
-  */
+  # Python
   ''
-    from time import sleep
-
-    start_all()
-
-    # Give the service time to run.
-    sleep(3)
-
-    with subtest("All services running"):
-      import json
-      def all_services_running(host):
-        (status, output) = host.systemctl("list-units --state=failed --plain --no-pager --output=json")
-        host_failed = json.loads(output)
-        assert len(host_failed) == 0, f"Expected zero failing services, but found: {json.dumps(host_failed, indent=4)}"
-      all_services_running(server)
-
     with subtest("Motd generated"):
-      sleep(1)
-      server.succeed("cat /var/lib/rust-motd/motd | tee /dev/stderr | grep --invert-match Error")
+      server.succeed("cat /var/lib/rust-motd/motd | tee /dev/stderr | grep --invert-match --ignore-case Error")
 
     server.copy_from_vm("/var/lib/rust-motd/motd")
   '';
diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix
index 47c16ff..d648429 100644
--- a/tests/by-name/sh/sharkey-cpu/test.nix
+++ b/tests/by-name/sh/sharkey-cpu/test.nix
@@ -1,25 +1,12 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
   pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
+vhack.runTest {
   name = "sharkey-cpu";
 
-  node = {
-    specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
-
   nodes = {
     server = {config, ...}: {
       imports =
@@ -45,12 +32,22 @@ nixos-lib.runTest {
           nodejs = pkgs.lib.getExe pkgs.nodejs;
           script = pkgs.writeTextFile {
             name = "script.js";
-            text = ''
-              import * as os from 'node:os';
+            text =
+              # js
+              ''
+                import * as os from 'node:os';
+
+                var cpus = os.cpus()
 
-              console.log(os.cpus()[0].model)
-              console.log(os.cpus().length)
-            '';
+                if (cpus.length != 0) {
+                  console.log(cpus[0].model)
+                } else {
+                  // Fail?
+                }
+
+                while (true) {
+                }
+              '';
           };
         in
           pkgs.lib.mkForce "${nodejs} ${script}";
@@ -58,24 +55,16 @@ nixos-lib.runTest {
     };
   };
 
-  testScript = {nodes, ...}:
-  /*
-  python
-  */
+  services = [
+    {server = "sharkey.service";}
+  ];
+
+  testScript = {...}:
+  # Python
   ''
     from time import sleep
 
-    start_all()
-
     # Give the service time to run.
     sleep(3)
-
-    with subtest("All services running"):
-      import json
-      def all_services_running(host):
-        (status, output) = host.systemctl("list-units --state=failed --plain --no-pager --output=json")
-        host_failed = json.loads(output)
-        assert len(host_failed) == 0, f"Expected zero failing services, but found: {json.dumps(host_failed, indent=4)}"
-      all_services_running(server)
   '';
 }
diff --git a/tests/by-name/sh/sharkey/test.nix b/tests/by-name/sh/sharkey/test.nix
index 0d79cd2..7b6f537 100644
--- a/tests/by-name/sh/sharkey/test.nix
+++ b/tests/by-name/sh/sharkey/test.nix
@@ -1,66 +1,21 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
-  pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
+vhack.runTest {
   name = "sharkey";
 
-  node = {
-    specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
+  serverDomains = [
+    {server = "sharkey.server";}
+  ];
 
   nodes = {
-    acme = {...}: {
-      imports = [
-        ../../../common/acme/server.nix
-        ../../../common/dns/client.nix
-      ];
-    };
-    name_server = {nodes, ...}: {
-      imports =
-        extraModules
-        ++ [
-          ../../../common/acme/client.nix
-          ../../../common/dns/server.nix
-        ];
-
-      vhack.dns.zones = {
-        "sharkey.server" = {
-          SOA = {
-            nameServer = "ns";
-            adminEmail = "admin@server.com";
-            serial = 2025012301;
-          };
-          useOrigin = false;
-
-          A = [
-            nodes.server.networking.primaryIPAddress
-          ];
-          AAAA = [
-            nodes.server.networking.primaryIPv6Address
-          ];
-        };
-      };
-    };
-
     server = {config, ...}: {
       imports =
         extraModules
         ++ [
           ../../../../modules
-          ../../../common/acme/client.nix
-          ../../../common/dns/client.nix
         ];
 
       vhack = {
@@ -73,30 +28,16 @@ nixos-lib.runTest {
       };
     };
 
-    client = {...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-    };
+    client = {...}: {};
   };
 
-  testScript = {nodes, ...}: let
-    acme = import ../../../common/acme {inherit pkgs;};
-  in
-    acme.prepare ["server" "client"]
-    # Python
-    ''
-      server.wait_for_unit("sharkey.service")
-
-      with subtest("All services running"):
-        import json
-        def all_services_running(host):
-          (status, output) = host.systemctl("list-units --state=failed --plain --no-pager --output=json")
-          host_failed = json.loads(output)
-          assert len(host_failed) == 0, f"Expected zero failing services, but found: {json.dumps(host_failed, indent=4)}"
-        all_services_running(server)
+  services = [
+    {server = "sharkey.service";}
+  ];
 
-      client.wait_until_succeeds("curl --silent https://sharkey.server | grep 'Thank you for using Sharkey!'")
-    '';
+  testScript = {...}:
+  # Python
+  ''
+    client.wait_until_succeeds("curl --verbose https://sharkey.server | grep 'Thank you for using Sharkey!'")
+  '';
 }
diff --git a/tests/by-name/ta/taskchampion-sync/test.nix b/tests/by-name/ta/taskchampion-sync/test.nix
index 4bca4e0..3878167 100644
--- a/tests/by-name/ta/taskchampion-sync/test.nix
+++ b/tests/by-name/ta/taskchampion-sync/test.nix
@@ -6,64 +6,26 @@
   pkgs,
   extraModules,
   nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs;
+vhack.runTest {
   name = "taskchampion-sync";
 
-  node = {
-    specialArgs = {inherit pkgsUnstable vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
+  serverDomains = [
+    {server = "taskchampion.server";}
+  ];
 
   nodes = let
     taskwarriorPackage = pkgs.taskwarrior3.overrideAttrs (final: prev: {
       cmakeFlags = (prev.cmakeFlags or []) ++ ["-DENABLE_TLS_NATIVE_ROOTS=true"];
     });
   in {
-    acme = {
-      imports = [
-        ../../../common/acme/server.nix
-        ../../../common/dns/client.nix
-      ];
-    };
-    name_server = {nodes, ...}: {
-      imports =
-        extraModules
-        ++ [
-          ../../../common/acme/client.nix
-          ../../../common/dns/server.nix
-        ];
-
-      vhack.dns.zones = {
-        "taskchampion.server" = {
-          SOA = {
-            nameServer = "ns";
-            adminEmail = "admin@server.com";
-            serial = 2025012301;
-          };
-          useOrigin = false;
-
-          A = [
-            nodes.server.networking.primaryIPAddress
-          ];
-          AAAA = [
-            nodes.server.networking.primaryIPv6Address
-          ];
-        };
-      };
-    };
-
     server = {config, ...}: {
       imports =
         extraModules
         ++ [
           ../../../../modules
-          ../../../common/acme/client.nix
-          ../../../common/dns/client.nix
         ];
 
       vhack = {
@@ -77,27 +39,21 @@ nixos-lib.runTest {
     };
 
     task_client1 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.systemPackages = [
         taskwarriorPackage
       ];
     };
     task_client2 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.systemPackages = [
         taskwarriorPackage
       ];
     };
   };
 
+  services = [
+    {server = "taskchampion-sync-server.service";}
+  ];
+
   testScript = {nodes, ...}: let
     # Generated with uuidgen
     uuid = "bf01376e-04a4-435a-9263-608567531af3";
@@ -112,13 +68,9 @@ nixos-lib.runTest {
         echo 'sync.server.client_id=${uuid}' >> "${path}"
         echo 'sync.encryption_secret=${password}' >> "${path}"
       '';
-
-    acme = import ../../../common/acme {inherit pkgs;};
   in
-    acme.prepare ["server" "task_client1" "task_client2"]
     # Python
     ''
-      server.wait_for_unit("taskchampion-sync-server.service")
       server.wait_for_open_port(443)
 
       with subtest("Setup task syncing"):