nixosTests.cntr: handleTest -> runTest

nixos/tests/all-tests.nix

@@ -321,7 +321,13 @@ in
   cloud-init = runTest ./cloud-init.nix;
   cloud-init-hostname = runTest ./cloud-init-hostname.nix;
   cloudlog = runTest ./cloudlog.nix;
-  cntr = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cntr.nix { };
+  cntr = import ./cntr.nix {
+    inherit (pkgs) lib;
+    runTest = runTestOn [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+  };
   cockpit = runTest ./cockpit.nix;
   cockroachdb = handleTestOn [ "x86_64-linux" ] ./cockroachdb.nix { };
   code-server = runTest ./code-server.nix;

nixos/tests/cntr.nix

@@ -1,28 +1,19 @@
 # Test for cntr tool
-{
+
-  system ? builtins.currentSystem,
+{ runTest, lib }:
-  config ? { },
-  pkgs ? import ../.. { inherit system config; },
-  lib ? pkgs.lib,
-}:
 
 let
-  inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
-
   mkOCITest =
     backend:
-    makeTest {
+    runTest {
       name = "cntr-${backend}";
 
-      meta = {
+      meta.maintainers = with lib.maintainers; [
-        maintainers = with lib.maintainers; [
         sorki
         mic92
       ];
-      };
 
-      nodes = {
+      nodes.${backend} =
-        ${backend} =
         { pkgs, ... }:
         {
           environment.systemPackages = [ pkgs.cntr ];
@@ -35,7 +26,6 @@ let
             };
           };
         };
-      };
 
       testScript = ''
         start_all()
@@ -53,18 +43,16 @@ let
       '';
     };
 
-  mkContainersTest = makeTest {
+  mkContainersTest = runTest {
     name = "cntr-containers";
 
-    meta = with pkgs.lib.maintainers; {
+    meta.maintainers = with lib.maintainers; [
-      maintainers = [
       sorki
       mic92
     ];
-    };
 
     nodes.machine =
-      { lib, ... }:
+      { pkgs, ... }:
       {
         environment.systemPackages = [ pkgs.cntr ];
         containers.test = {