movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-10 11:45:45 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixosTests.xrdp: migrate to runTest

Browse source 
Part Of #386873
This commit is contained in:
Martin Weinelt 2025-03-14 23:15:25 +01:00
parent 2af95991ab
commit 6d1946030c
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 52 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/tests/all-tests.nix
View file

@ -1292,7 +1292,7 @@ in {
xmonad = handleTest ./xmonad.nix {}; xmonad = handleTest ./xmonad.nix {};
xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {}; xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};
xpadneo = handleTest ./xpadneo.nix {}; xpadneo = handleTest ./xpadneo.nix {};
xrdp = handleTest ./xrdp.nix {}; xrdp = runTest ./xrdp.nix;
xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix; xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix;
xscreensaver = handleTest ./xscreensaver.nix {}; xscreensaver = handleTest ./xscreensaver.nix {};
xss-lock = runTest ./xss-lock.nix; xss-lock = runTest ./xss-lock.nix;

10
nixos/tests/xrdp.nix
View file

@ -1,6 +1,5 @@
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: {
{
name = "xrdp"; name = "xrdp";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ ]; maintainers = [ ];
@ -33,7 +32,7 @@ import ./make-test-python.nix (
testScript = testScript =
{ nodes, ... }: { nodes, ... }:
let let
user = nodes.client.config.users.users.alice; user = nodes.client.users.users.alice;
in in
'' ''
start_all() start_all()
@ -56,5 +55,4 @@ import ./make-test-python.nix (
client.sleep(5) client.sleep(5)
client.screenshot("remoterdp") client.screenshot("remoterdp")
''; '';
} }
)