From dd4d691d9b3bdf73b5f0587a70449f44bca4b5f6 Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 6 Nov 2024 20:08:39 +0100 Subject: [PATCH 1/2] nixosTests.retroarch: format using nixfmt --- nixos/tests/retroarch.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 0e5f60aa8be2..330138e8b3b4 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -1,10 +1,14 @@ -import ./make-test-python.nix ({ pkgs, ... }: +import ./make-test-python.nix ( + { pkgs, ... }: { name = "retroarch"; - meta = with pkgs.lib; { maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; }; + meta = with pkgs.lib; { + maintainers = teams.libretro.members ++ [ maintainers.j0hax ]; + }; - nodes.machine = { ... }: + nodes.machine = + { ... }: { imports = [ ./common/user-account.nix ]; @@ -23,11 +27,13 @@ import ./make-test-python.nix ({ pkgs, ... }: }; }; - testScript = { nodes, ... }: + testScript = + { nodes, ... }: let user = nodes.machine.config.users.users.alice; xdo = "${pkgs.xdotool}/bin/xdotool"; - in '' + in + '' with subtest("Wait for login"): start_all() machine.wait_for_file("/tmp/xauth_*") @@ -46,4 +52,5 @@ import ./make-test-python.nix ({ pkgs, ... }: ) machine.screenshot("screen") ''; - }) + } +) From 5d0cd804a5c0d935c7488597cf5de66a9a88c5ff Mon Sep 17 00:00:00 2001 From: Noa Aarts Date: Wed, 6 Nov 2024 20:09:10 +0100 Subject: [PATCH 2/2] nixosTests.retroarch: fix test by changing expected window title --- nixos/tests/retroarch.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/retroarch.nix b/nixos/tests/retroarch.nix index 330138e8b3b4..d13ed074b9c9 100644 --- a/nixos/tests/retroarch.nix +++ b/nixos/tests/retroarch.nix @@ -41,7 +41,7 @@ import ./make-test-python.nix ( with subtest("Check RetroArch started"): machine.wait_until_succeeds("pgrep retroarch") - machine.wait_for_window("^RetroArch ") + machine.wait_for_window("^RetroArch") with subtest("Check configuration created"): machine.wait_for_file("${user.home}/.config/retroarch/retroarch.cfg")