From 6d1946030c931e26b0d1431057249f60e49b34e6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 14 Mar 2025 23:15:25 +0100
Subject: [PATCH] nixosTests.xrdp: migrate to runTest

Part Of #386873
---
 nixos/tests/all-tests.nix |   2 +-
 nixos/tests/xrdp.nix      | 104 +++++++++++++++++++-------------------
 2 files changed, 52 insertions(+), 54 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index b96f805068d4..0777f5a7b9cf 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1292,7 +1292,7 @@ in {
   xmonad = handleTest ./xmonad.nix {};
   xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};
   xpadneo = handleTest ./xpadneo.nix {};
-  xrdp = handleTest ./xrdp.nix {};
+  xrdp = runTest ./xrdp.nix;
   xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix;
   xscreensaver = handleTest ./xscreensaver.nix {};
   xss-lock = runTest ./xss-lock.nix;
diff --git a/nixos/tests/xrdp.nix b/nixos/tests/xrdp.nix
index 10cc80de5056..fdf598a87467 100644
--- a/nixos/tests/xrdp.nix
+++ b/nixos/tests/xrdp.nix
@@ -1,60 +1,58 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-  {
-    name = "xrdp";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ ];
-    };
+{ pkgs, ... }:
+{
+  name = "xrdp";
+  meta = with pkgs.lib.maintainers; {
+    maintainers = [ ];
+  };
 
-    nodes = {
-      server =
-        { pkgs, ... }:
-        {
-          imports = [ ./common/user-account.nix ];
-          services.xrdp.enable = true;
-          services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
-          networking.firewall.allowedTCPPorts = [ 3389 ];
-        };
+  nodes = {
+    server =
+      { pkgs, ... }:
+      {
+        imports = [ ./common/user-account.nix ];
+        services.xrdp.enable = true;
+        services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";
+        networking.firewall.allowedTCPPorts = [ 3389 ];
+      };
 
-      client =
-        { pkgs, ... }:
-        {
-          imports = [
-            ./common/x11.nix
-            ./common/user-account.nix
-          ];
-          test-support.displayManager.auto.user = "alice";
-          environment.systemPackages = [ pkgs.freerdp ];
-          services.xrdp.enable = true;
-          services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";
-        };
-    };
+    client =
+      { pkgs, ... }:
+      {
+        imports = [
+          ./common/x11.nix
+          ./common/user-account.nix
+        ];
+        test-support.displayManager.auto.user = "alice";
+        environment.systemPackages = [ pkgs.freerdp ];
+        services.xrdp.enable = true;
+        services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";
+      };
+  };
 
-    testScript =
-      { nodes, ... }:
-      let
-        user = nodes.client.config.users.users.alice;
-      in
-      ''
-        start_all()
+  testScript =
+    { nodes, ... }:
+    let
+      user = nodes.client.users.users.alice;
+    in
+    ''
+      start_all()
 
-        client.wait_for_x()
-        client.wait_for_file("${user.home}/.Xauthority")
-        client.succeed("xauth merge ${user.home}/.Xauthority")
+      client.wait_for_x()
+      client.wait_for_file("${user.home}/.Xauthority")
+      client.succeed("xauth merge ${user.home}/.Xauthority")
 
-        client.sleep(5)
+      client.sleep(5)
 
-        client.execute("xterm >&2 &")
-        client.sleep(1)
-        client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password}\n")
-        client.sleep(5)
-        client.screenshot("localrdp")
+      client.execute("xterm >&2 &")
+      client.sleep(1)
+      client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password}\n")
+      client.sleep(5)
+      client.screenshot("localrdp")
 
-        client.execute("xterm >&2 &")
-        client.sleep(1)
-        client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password}\n")
-        client.sleep(5)
-        client.screenshot("remoterdp")
-      '';
-  }
-)
+      client.execute("xterm >&2 &")
+      client.sleep(1)
+      client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password}\n")
+      client.sleep(5)
+      client.screenshot("remoterdp")
+    '';
+}