From 2dd453b74b60f903933dd141475fd9dd89fa45a4 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 7 Jun 2025 20:52:33 +0800
Subject: [PATCH] nixosTests.cri-o: handleTest -> runTest

---
 nixos/tests/all-tests.nix |  2 +-
 nixos/tests/cri-o.nix     | 35 +++++++++++++++--------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index e5a3ec7d3b6f..fb385415d98f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -384,7 +384,7 @@ in
   coturn = runTest ./coturn.nix;
   couchdb = runTest ./couchdb.nix;
   crabfit = runTest ./crabfit.nix;
-  cri-o = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix { };
+  cri-o = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix;
   cryptpad = runTest ./cryptpad.nix;
   cups-pdf = runTest ./cups-pdf.nix;
   curl-impersonate = runTest ./curl-impersonate.nix;
diff --git a/nixos/tests/cri-o.nix b/nixos/tests/cri-o.nix
index 216351bda8db..703ea259f479 100644
--- a/nixos/tests/cri-o.nix
+++ b/nixos/tests/cri-o.nix
@@ -1,22 +1,17 @@
-# This test runs CRI-O and verifies via critest
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "cri-o";
-    meta.maintainers = with pkgs.lib; teams.podman.members;
+{ lib, ... }:
+{
+  name = "cri-o";
+  meta.maintainers = lib.teams.podman.members;
 
-    nodes = {
-      crio = {
-        virtualisation.cri-o.enable = true;
-      };
-    };
+  nodes.crio = {
+    virtualisation.cri-o.enable = true;
+  };
 
-    testScript = ''
-      start_all()
-      crio.wait_for_unit("crio.service")
-      crio.succeed(
-          "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"
-      )
-    '';
-  }
-)
+  testScript = ''
+    start_all()
+    crio.wait_for_unit("crio.service")
+    crio.succeed(
+        "critest --ginkgo.focus='Runtime info' --runtime-endpoint unix:///var/run/crio/crio.sock"
+    )
+  '';
+}