From d3b5f7650551e90a4e3b486327521a18e7d5419d Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 2 Apr 2025 17:14:24 +0200
Subject: [PATCH] nixosTests.docker-tools-overlay: migrate to runTestOn

Part of #386873
---
 nixos/tests/all-tests.nix            |  2 +-
 nixos/tests/docker-tools-overlay.nix | 63 +++++++++++++---------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 36ea1dcf68a6..ea46753b748c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -375,7 +375,7 @@ in
   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 { };
-  docker-tools-overlay = handleTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix { };
+  docker-tools-overlay = runTestOn [ "x86_64-linux" ] ./docker-tools-overlay.nix;
   docling-serve = runTest ./docling-serve.nix;
   documize = handleTest ./documize.nix { };
   documentation = pkgs.callPackage ../modules/misc/documentation/test.nix { inherit nixosLib; };
diff --git a/nixos/tests/docker-tools-overlay.nix b/nixos/tests/docker-tools-overlay.nix
index a1de0272703f..98a72f78e3e1 100644
--- a/nixos/tests/docker-tools-overlay.nix
+++ b/nixos/tests/docker-tools-overlay.nix
@@ -1,38 +1,35 @@
 # this test creates a simple GNU image with docker tools and sees if it executes
+{ pkgs, ... }:
+{
+  name = "docker-tools-overlay";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [
+      lnl7
+      roberth
+    ];
+  };
 
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "docker-tools-overlay";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [
-        lnl7
-        roberth
-      ];
-    };
+  nodes = {
+    docker =
+      { ... }:
+      {
+        virtualisation.docker.enable = true;
+        virtualisation.docker.storageDriver = "overlay2";
+      };
+  };
 
-    nodes = {
-      docker =
-        { ... }:
-        {
-          virtualisation.docker.enable = true;
-          virtualisation.docker.storageDriver = "overlay2";
-        };
-    };
+  testScript = ''
+    docker.wait_for_unit("sockets.target")
 
-    testScript = ''
-      docker.wait_for_unit("sockets.target")
+    docker.succeed(
+        "docker load --input='${pkgs.dockerTools.examples.bash}'",
+        "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",
+    )
 
-      docker.succeed(
-          "docker load --input='${pkgs.dockerTools.examples.bash}'",
-          "docker run --rm ${pkgs.dockerTools.examples.bash.imageName} bash --version",
-      )
-
-      # Check if the nix store has correct user permissions depending on what
-      # storage driver is used, incorrectly built images can show up as readonly.
-      # drw-------  3 0 0   3 Apr 14 11:36 /nix
-      # drw------- 99 0 0 100 Apr 14 11:36 /nix/store
-      docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
-    '';
-  }
-)
+    # Check if the nix store has correct user permissions depending on what
+    # storage driver is used, incorrectly built images can show up as readonly.
+    # drw-------  3 0 0   3 Apr 14 11:36 /nix
+    # drw------- 99 0 0 100 Apr 14 11:36 /nix/store
+    docker.succeed("docker run --rm -u 1000:1000 ${pkgs.dockerTools.examples.bash.imageName} bash --version")
+  '';
+}