fix: integration test

Author: fricklerhandwerk

nix/tests/default.nix

@@ -39,18 +39,32 @@ let
   hydra = {
     port = toString 8080;
     mock = pkgs.writeText "hydra-mock" ''
+      import json
       from http.server import BaseHTTPRequestHandler, HTTPServer
+
+      nixpkgs_url = "file://${dummy-nixpkgs}"
+      with open("${dummy-nixpkgs}/REVISION") as f:
+          revision = f.read().strip()
+
+      responses = {
+          "jobset": {"inputs": {"nixpkgs": {"type": "git", "value": nixpkgs_url}}},
+          "job": {"id": 1, "jobsetevals": [1]},
+          "eval": {"id": 1, "jobsetevalinputs": {"nixpkgs": {"type": "git", "uri": nixpkgs_url, "revision": revision}}},
+      }
+
       class H(BaseHTTPRequestHandler):
           def do_GET(self):
+              body = responses.get(self.path.split("/")[1])
+              if body is None:
+                  self.send_response(404)
+                  self.end_headers()
+                  return
               self.send_response(200)
               self.send_header("Content-Type", "application/json")
               self.end_headers()
-              self.wfile.write(b'${
-                builtins.toJSON {
-                  inputs.nixpkgs.value = "file://${dummy-nixpkgs}";
-                }
-              }')
+              self.wfile.write(json.dumps(body).encode())
           log_message = lambda *_: None
+
       HTTPServer(("", ${hydra.port}), H).serve_forever()
     '';
   };

src/shared/management/commands/fetch_all_channels.py

@@ -52,8 +52,9 @@ def handle(self, *args: Any, **kwargs: Any) -> str | None:
             # By pre-configuring the source location on our end, we're decoupling the routing (where to get the data) from the parameters (which piece of the data to get).
             # This slightly reduces our reliance on Hydra to be trustworthy:
             # Limit the blast radius of compromise to be denial of service for updates instead of silent poisoning of new data.
-            assert settings.GIT_CLONE_URL == source.url, (
-                f"Unexpected source URL: {source.url}"
+            # FIXME(@fricklerhandwerk): The values should be directly comparable but for some reason aren't.
+            assert str(settings.GIT_CLONE_URL) == str(source.url), (
+                f"Unexpected source URL: {source.url!r}, expected {settings.GIT_CLONE_URL!r}"
             )
 
             # FIXME(@fricklerhandwerk): Deduplicate the release branches beforehand.
@@ -73,7 +74,10 @@ def handle(self, *args: Any, **kwargs: Any) -> str | None:
             )
             evaluation = client.get_evaluation(latest_build.jobsetevals[0])
             eval_input = evaluation.jobsetevalinputs[settings.HYDRA_INPUT_NAME]
-            assert eval_input.uri == source.url  # Sanity check
+            # FIXME(@fricklerhandwerk): The values should be directly comparable but for some reason aren't.
+            assert str(eval_input.uri) == str(source.url), (
+                f"Unexpected eval input URI: {eval_input.uri!r}, expected {source.url!r}"
+            )
             commit = eval_input.revision
 
             ch, created = NixChannel.objects.update_or_create(