1 files changed, 27 insertions, 75 deletions

diff --git a/tests/by-name/at/atuin-sync/test.nix b/tests/by-name/at/atuin-sync/test.nix
index d65c216..627e89e 100644
--- a/tests/by-name/at/atuin-sync/test.nix
+++ b/tests/by-name/at/atuin-sync/test.nix
@@ -6,62 +6,27 @@
   pkgs,
   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 = {
@@ -75,50 +40,37 @@ nixos-lib.runTest {
     };
 
     client1 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.sessionVariables.ATUIN_SESSION = atuinSession;
 
       environment.systemPackages = [
-        pkgs.atuin
+        atuin
         pkgs.sqlite-interactive
       ];
     };
     client2 = {config, ...}: {
-      imports = [
-        ../../../common/acme/client.nix
-        ../../../common/dns/client.nix
-      ];
-
       environment.sessionVariables.ATUIN_SESSION = atuinSession;
 
       environment.systemPackages = [
-        pkgs.atuin
+        atuin
         pkgs.sqlite-interactive
       ];
     };
   };
 
-  testScript = {nodes, ...}: let
-    syncLogin = pkgs.writeShellScript "login-atuin-sync-account" ''
-      atuin login --username syncy --password password1234 --key "$1"
-    '';
-
-    syncRegister = pkgs.writeShellScript "register-atuin-sync-account" ''
-      atuin register --username syncy --email syncy@email.com --password password1234
-    '';
+  services = [
+    {server = "turtle.service";}
+  ];
 
+  testScript = {nodes, ...}: let
     mkSyncConfig = pkgs.writeShellScript "register-atuin-sync-account" ''
       mkdir --parents ~/.config/atuin/
+
       cat << EOF > ~/.config/atuin/config.toml
-      sync_address = "https://atuin-sync.server"
 
-      # Use the v2 sync
       [sync]
-      records = true
+      address = "https://atuin-sync.server"
+      user_id_path = "${pkgs.writeText "user-id" "019eb88a-6b51-7e52-b12c-7d30bd8e5928"}"
+      encryption_key_path = "${pkgs.writeText "encryption-key" "3AAgbWsDzL7M00/Mq0LMjsyOCy3MnsypBsyQzKbMywNGzNnMrUBozIINAxdbIiDMhQ=="}"
       EOF
     '';
 
@@ -141,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("atuin.service")
       server.wait_for_open_port(443)
 
       # Wait for the server to acquire the acme certificate
@@ -158,8 +106,12 @@ nixos-lib.runTest {
           for client in [client1, client2]:
             client.succeed("${mkSyncConfig}")
 
-          client1.succeed("${syncRegister}")
-          client2.succeed(f"${syncLogin} '{client1.succeed("atuin key")}'")
+      with subtest("Start atuin daemons"):
+          for client in [client1, client2]:
+            client.succeed("systemd-run atuin daemon start")
+
+          for client in [client1, client2]:
+            client.wait_until_succeeds("atuin daemon status")
 
       with subtest("Can import shell history"):
           client1.succeed("${runCommandAndRecordInAtuin} echo hi - client 1")
@@ -167,8 +119,8 @@ nixos-lib.runTest {
 
       with subtest("Can sync tasks"):
           for client in [client1, client2]:
-            client.succeed("atuin sync --force")
-          client1.succeed("atuin sync --force")
+            client.succeed("atuin sync perform --force")
+          client1.succeed("atuin sync perform --force")
 
 
       with subtest("Have correct tasks"):