From cc69d51afbd7362d727a83043898ca9d8a77b04d Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 2 Apr 2025 14:57:40 +0200
Subject: [PATCH] nixosTests.docker-registry: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix       |   2 +-
 nixos/tests/docker-registry.nix | 123 ++++++++++++++++----------------
 2 files changed, 61 insertions(+), 64 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index fd200903c79d..36ea1dcf68a6 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -371,7 +371,7 @@ in
   doas = runTest ./doas.nix;
   docker = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker.nix;
   docker-rootless = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./docker-rootless.nix;
-  docker-registry = handleTest ./docker-registry.nix { };
+  docker-registry = runTest ./docker-registry.nix;
   docker-tools = handleTestOn [ "x86_64-linux" ] ./docker-tools.nix { };
   docker-tools-nix-shell = runTest ./docker-tools-nix-shell.nix;
   docker-tools-cross = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./docker-tools-cross.nix { };
diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix
index aeb95a564c0e..73658b67fb13 100644
--- a/nixos/tests/docker-registry.nix
+++ b/nixos/tests/docker-registry.nix
@@ -1,74 +1,71 @@
 # This test runs docker-registry and check if it works
+{ pkgs, ... }:
+{
+  name = "docker-registry";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      globin
+      ironpinguin
+      cafkafk
+    ];
+  };
 
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "docker-registry";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        globin
-        ironpinguin
-        cafkafk
-      ];
-    };
+  nodes = {
+    registry =
+      { ... }:
+      {
+        services.dockerRegistry.enable = true;
+        services.dockerRegistry.enableDelete = true;
+        services.dockerRegistry.port = 8080;
+        services.dockerRegistry.listenAddress = "0.0.0.0";
+        services.dockerRegistry.enableGarbageCollect = true;
+        services.dockerRegistry.openFirewall = true;
+      };
 
-    nodes = {
-      registry =
-        { ... }:
-        {
-          services.dockerRegistry.enable = true;
-          services.dockerRegistry.enableDelete = true;
-          services.dockerRegistry.port = 8080;
-          services.dockerRegistry.listenAddress = "0.0.0.0";
-          services.dockerRegistry.enableGarbageCollect = true;
-          services.dockerRegistry.openFirewall = true;
-        };
+    client1 =
+      { ... }:
+      {
+        virtualisation.docker.enable = true;
+        virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
+      };
 
-      client1 =
-        { ... }:
-        {
-          virtualisation.docker.enable = true;
-          virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
-        };
+    client2 =
+      { ... }:
+      {
+        virtualisation.docker.enable = true;
+        virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
+      };
+  };
 
-      client2 =
-        { ... }:
-        {
-          virtualisation.docker.enable = true;
-          virtualisation.docker.extraOptions = "--insecure-registry registry:8080";
-        };
-    };
+  testScript = ''
+    client1.start()
+    client1.wait_for_unit("docker.service")
+    client1.succeed("tar cv --files-from /dev/null | docker import - scratch")
+    client1.succeed("docker tag scratch registry:8080/scratch")
 
-    testScript = ''
-      client1.start()
-      client1.wait_for_unit("docker.service")
-      client1.succeed("tar cv --files-from /dev/null | docker import - scratch")
-      client1.succeed("docker tag scratch registry:8080/scratch")
+    registry.start()
+    registry.wait_for_unit("docker-registry.service")
+    registry.wait_for_open_port(8080)
+    client1.succeed("docker push registry:8080/scratch")
 
-      registry.start()
-      registry.wait_for_unit("docker-registry.service")
-      registry.wait_for_open_port(8080)
-      client1.succeed("docker push registry:8080/scratch")
+    client2.start()
+    client2.wait_for_unit("docker.service")
+    client2.succeed("docker pull registry:8080/scratch")
+    client2.succeed("docker images | grep scratch")
 
-      client2.start()
-      client2.wait_for_unit("docker.service")
-      client2.succeed("docker pull registry:8080/scratch")
-      client2.succeed("docker images | grep scratch")
+    client2.succeed(
+        "curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H\"Accept: application/vnd.docker.distribution.manifest.v2+json\" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e 's/Docker-Content-Digest: //' | tr -d '\\r')"
+    )
 
-      client2.succeed(
-          "curl -fsS -X DELETE registry:8080/v2/scratch/manifests/$(curl -fsS -I -H\"Accept: application/vnd.docker.distribution.manifest.v2+json\" registry:8080/v2/scratch/manifests/latest | grep Docker-Content-Digest | sed -e 's/Docker-Content-Digest: //' | tr -d '\\r')"
-      )
+    registry.systemctl("start docker-registry-garbage-collect.service")
+    registry.wait_until_fails("systemctl status docker-registry-garbage-collect.service")
+    registry.wait_for_unit("docker-registry.service")
 
-      registry.systemctl("start docker-registry-garbage-collect.service")
-      registry.wait_until_fails("systemctl status docker-registry-garbage-collect.service")
-      registry.wait_for_unit("docker-registry.service")
+    registry.fail("ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data")
 
-      registry.fail("ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data")
-
-      client1.succeed("docker push registry:8080/scratch")
-      registry.succeed(
-          "ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data"
-      )
-    '';
-  }
-)
+    client1.succeed("docker push registry:8080/scratch")
+    registry.succeed(
+        "ls -l /var/lib/docker-registry/docker/registry/v2/blobs/sha256/*/*/data"
+    )
+  '';
+}