2 files changed, 42 insertions, 129 deletions

diff --git a/tests/by-name/sh/sharkey-cpu/test.nix b/tests/by-name/sh/sharkey-cpu/test.nix
index d4f9332..d648429 100644
--- a/tests/by-name/sh/sharkey-cpu/test.nix
+++ b/tests/by-name/sh/sharkey-cpu/test.nix
@@ -1,24 +1,11 @@
 {
-  nixos-lib,
-  pkgsUnstable,
-  nixpkgs-unstable,
-  vhackPackages,
   pkgs,
   extraModules,
-  nixLib,
+  vhack,
   ...
 }:
-nixos-lib.runTest {
-  hostPkgs = pkgs; # the Nixpkgs package set used outside the VMs
-
-  name = "sharkey-images";
-
-  node = {
-    specialArgs = {inherit pkgsUnstable extraModules vhackPackages nixpkgs-unstable nixLib;};
-
-    # Use the nixpkgs as constructed by the `nixpkgs.*` options
-    pkgs = null;
-  };
+vhack.runTest {
+  name = "sharkey-cpu";
 
   nodes = {
     server = {config, ...}: {
@@ -38,19 +25,29 @@ nixos-lib.runTest {
       };
       systemd.services = {
         # Avoid an error from this service.
-        "acme-sharkey.server".serviceConfig.ExecStart = pkgs.lib.mkForce "${pkgs.lib.getExe' pkgs.coreutils "true"}";
+        "acme-sharkey.server".enable = false;
 
-        # Test, that sharkey's hardening still allows access to the CPUs.
+        # Test that sharkey's hardening still allows access to the CPUs.
         sharkey.serviceConfig.ExecStart = let
-          nodejs = pkgs.lib.getExe pkgsUnstable.nodejs;
+          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,25 +55,16 @@ nixos-lib.runTest {
     };
   };
 
-  testScript = {nodes, ...}:
-  /*
-  python
-  */
+  services = [
+    {server = "sharkey.service";}
+  ];
+
+  testScript = {...}:
+  # Python
   ''
     from time import sleep
 
-    start_all()
-    server.wait_for_unit("sharkey.service")
-
-    # Give the service time to start.
+    # 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 40efe17..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,46 +28,16 @@ nixos-lib.runTest {
       };
     };
 
-    client = {...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-    };
+    client = {...}: {};
   };
 
-  testScript = {nodes, ...}: let
-    acme_scripts = import ../../../common/acme/scripts.nix {inherit pkgs;};
-  in
-    /*
-    python
-    */
-    ''
-      # Start dependencies for the other services
-      acme.start()
-      acme.wait_for_unit("pebble.service")
-      name_server.start()
-      name_server.wait_for_unit("nsd.service")
-
-      # Start the actual testing machines
-      start_all()
-
-
-      with subtest("Add pebble ca key to all services"):
-        for node in [name_server, server, client]:
-          node.wait_for_unit("network-online.target")
-          node.succeed("${acme_scripts.add_pebble_acme_ca}")
-
-      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!'")
+  '';
 }