From ce207587ab1d53c99f71ba83a347aa8411a66254 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Wed, 23 Apr 2025 19:47:51 +0200
Subject: [PATCH] nixosTests.noto-fonts: migrate to runTest

Part of #386873
---
 nixos/tests/all-tests.nix  |  2 +-
 nixos/tests/noto-fonts.nix | 58 +++++++++++++++++++-------------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 78cc8b6c3d68..e3e2f5763d17 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -948,7 +948,7 @@ in
   nomad = runTest ./nomad.nix;
   non-default-filesystems = handleTest ./non-default-filesystems.nix { };
   non-switchable-system = runTest ./non-switchable-system.nix;
-  noto-fonts = handleTest ./noto-fonts.nix { };
+  noto-fonts = runTest ./noto-fonts.nix;
   noto-fonts-cjk-qt-default-weight = handleTest ./noto-fonts-cjk-qt-default-weight.nix { };
   novacomd = handleTestOn [ "x86_64-linux" ] ./novacomd.nix { };
   npmrc = handleTest ./npmrc.nix { };
diff --git a/nixos/tests/noto-fonts.nix b/nixos/tests/noto-fonts.nix
index 2d204131dcf9..719ea9f33eac 100644
--- a/nixos/tests/noto-fonts.nix
+++ b/nixos/tests/noto-fonts.nix
@@ -1,13 +1,14 @@
-import ./make-test-python.nix (
-  { pkgs, lib, ... }:
-  {
-    name = "noto-fonts";
-    meta.maintainers = with lib.maintainers; [
-      nickcao
-      midchildan
-    ];
+{ lib, ... }:
+{
+  name = "noto-fonts";
+  meta.maintainers = with lib.maintainers; [
+    nickcao
+    midchildan
+  ];
 
-    nodes.machine = {
+  nodes.machine =
+    { pkgs, ... }:
+    {
       imports = [ ./common/x11.nix ];
       environment.systemPackages = [ pkgs.gedit ];
       fonts = {
@@ -36,24 +37,23 @@ import ./make-test-python.nix (
       };
     };
 
-    testScript =
-      # extracted from http://www.clagnut.com/blog/2380/
-      let
-        testText = builtins.toFile "test.txt" ''
-          the quick brown fox jumps over the lazy dog
-          視野無限廣，窗外有藍天
-          Eĥoŝanĝo ĉiuĵaŭde.
-          いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす
-          다람쥐 헌 쳇바퀴에 타고파
-          中国智造，慧及全球
-        '';
-      in
-      ''
-        machine.wait_for_x()
-        machine.succeed("gedit ${testText} >&2 &")
-        machine.wait_for_window(".* - gedit")
-        machine.sleep(10)
-        machine.screenshot("screen")
+  testScript =
+    # extracted from http://www.clagnut.com/blog/2380/
+    let
+      testText = builtins.toFile "test.txt" ''
+        the quick brown fox jumps over the lazy dog
+        視野無限廣，窗外有藍天
+        Eĥoŝanĝo ĉiuĵaŭde.
+        いろはにほへと ちりぬるを わかよたれそ つねならむ うゐのおくやま けふこえて あさきゆめみし ゑひもせす
+        다람쥐 헌 쳇바퀴에 타고파
+        中国智造，慧及全球
       '';
-  }
-)
+    in
+    ''
+      machine.wait_for_x()
+      machine.succeed("gedit ${testText} >&2 &")
+      machine.wait_for_window(".* - gedit")
+      machine.sleep(10)
+      machine.screenshot("screen")
+    '';
+}