1 files changed, 19 insertions, 30 deletions

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
+      ''}")
     '';
   }