From c6ef5cd40598d4cba0ba4817d81230e9d66c3f05 Mon Sep 17 00:00:00 2001
From: ibizaman <ibizaman@tiserbox.com>
Date: Sun, 6 Jul 2025 23:36:42 +0200
Subject: [PATCH] make sure jellyfin actually started in tests

---
 test/common.nix            | 62 ++++++++++++++++++++++++++------------
 test/services/jellyfin.nix |  3 ++
 2 files changed, 45 insertions(+), 20 deletions(-)

diff --git a/test/common.nix b/test/common.nix
index 51c6cff..cc87b0b 100644
--- a/test/common.nix
+++ b/test/common.nix
@@ -15,6 +15,7 @@ let
     , waitForServices ? s: []
     , waitForPorts ? p: []
     , waitForUnixSocket ? u: []
+    , waitForUrls ? u: []
     , extraScript ? {...}: ""
     , redirectSSO ? false
   }: { nodes, ... }:
@@ -36,6 +37,29 @@ let
     import pathlib
 
     start_all()
+
+    def curl(target, format, endpoint, data="", extra=""):
+        cmd = ("curl --show-error --location"
+              + " --cookie-jar cookie.txt"
+              + " --cookie cookie.txt"
+              + " --connect-to ${fqdn}:443:server:443"
+              + " --connect-to ${fqdn}:80:server:80"
+              # Client must be able to resolve talking to auth server
+              + " --connect-to auth.${cfg.domain}:443:server:443"
+              + (f" --data '{data}'" if data != "" else "")
+              + (f" --silent --output /dev/null --write-out '{format}'" if format != "" else "")
+              + (f" {extra}" if extra != "" else "")
+              + f" {endpoint}")
+        print(cmd)
+        _, r = target.execute(cmd)
+        print(r)
+        try:
+            return json.loads(r)
+        except:
+            return r
+
+    def unline_with(j, s):
+        return j.join((x.strip() for x in s.split("\n")))
     ''
     + lib.strings.concatMapStrings (s: ''server.wait_for_unit("${s}")'' + "\n") (
       waitForServices args
@@ -53,27 +77,25 @@ let
         client.succeed("rm -r /etc/ssl/certs")
         client.copy_from_host(str(pathlib.Path(os.environ.get("out", os.getcwd())) / "ca-certificates.crt"), "/etc/ssl/certs/ca-certificates.crt")
 
-    def curl(target, format, endpoint, data="", extra=""):
-        cmd = ("curl --show-error --location"
-              + " --cookie-jar cookie.txt"
-              + " --cookie cookie.txt"
-              + " --connect-to ${fqdn}:443:server:443"
-              + " --connect-to ${fqdn}:80:server:80"
-              # Client must be able to resolve talking to auth server
-              + " --connect-to auth.${cfg.domain}:443:server:443"
-              + (f" --data '{data}'" if data != "" else "")
-              + (f" --silent --output /dev/null --write-out '{format}'" if format != "" else "")
-              + (f" {extra}" if extra != "" else "")
-              + f" {endpoint}")
-        print(cmd)
-        _, r = target.execute(cmd)
-        # print(r)
-        return json.loads(r)
-
-    def unline_with(j, s):
-        return j.join((x.strip() for x in s.split("\n")))
-
     ''
+    # Making a curl request to an URL needs to happen after we copied the certificates over,
+    # otherwise curl will not be able to verify the "legitimacy of the server".
+    + lib.strings.concatMapStrings (u: ''
+        import time
+
+        done = False
+        count = 15
+        while not done and count > 0:
+            response = curl(client, """{"code":%{response_code}}""", "${u}")
+            time.sleep(5)
+            count -= 1
+            if isinstance(response, dict):
+                done = response.get('code') == 200
+        if not done:
+            raise Exception(f"Response was never 200, got last: {response}")
+      '' + "\n") (
+      waitForUrls args
+    )
     + (if (! redirectSSO) then ''
     with subtest("access"):
         response = curl(client, """{"code":%{response_code}}""", "${proto_fqdn}")
diff --git a/test/services/jellyfin.nix b/test/services/jellyfin.nix
index 8149752..ab83c5b 100644
--- a/test/services/jellyfin.nix
+++ b/test/services/jellyfin.nix
@@ -11,6 +11,9 @@ let
     waitForPorts = { node, ... }: [
       8096
     ];
+    waitForUrls = { proto_fqdn, ... }: [
+      "${proto_fqdn}/System/Info/Public"
+    ];
   };
 
   basic = { config, ... }: {