diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5bc923268fae..b96f805068d4 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1293,7 +1293,7 @@ in { xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {}; xpadneo = handleTest ./xpadneo.nix {}; xrdp = handleTest ./xrdp.nix {}; - xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {}; + xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix; xscreensaver = handleTest ./xscreensaver.nix {}; xss-lock = runTest ./xss-lock.nix; xterm = runTest ./xterm.nix; diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix index a10e6b85326c..cc630143b990 100644 --- a/nixos/tests/xrdp-with-audio-pulseaudio.nix +++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix @@ -1,110 +1,108 @@ -import ./make-test-python.nix ( - { pkgs, ... }: - { - # How to interactively test this module if the audio actually works +{ pkgs, ... }: +{ + # How to interactively test this module if the audio actually works - # - nix run .#pulseaudio-module-xrdp.tests.xrdp-with-audio-pulseaudio.driverInteractive - # - test_script() # launches the terminal and the tests itself - # - server.send_monitor_command("hostfwd_add tcp::3389-:3389") # forward the RDP port to the host - # - Connect with the RDP client you like (ex: Remmina) - # - Don't forget to enable audio support. In remmina: Advanced -> Audio output mode to Local (default is Off) - # - Open a browser or something that plays sound. Ex: chromium + # - nix run .#pulseaudio-module-xrdp.tests.xrdp-with-audio-pulseaudio.driverInteractive + # - test_script() # launches the terminal and the tests itself + # - server.send_monitor_command("hostfwd_add tcp::3389-:3389") # forward the RDP port to the host + # - Connect with the RDP client you like (ex: Remmina) + # - Don't forget to enable audio support. In remmina: Advanced -> Audio output mode to Local (default is Off) + # - Open a browser or something that plays sound. Ex: chromium - name = "xrdp-with-audio-pulseaudio"; - meta = with pkgs.lib.maintainers; { - maintainers = [ lucasew ]; - }; + name = "xrdp-with-audio-pulseaudio"; + meta = with pkgs.lib.maintainers; { + maintainers = [ lucasew ]; + }; - nodes = { - server = - { pkgs, ... }: - { - imports = [ ./common/user-account.nix ]; + nodes = { + server = + { pkgs, ... }: + { + imports = [ ./common/user-account.nix ]; - environment.etc."xrdp/test.txt".text = "Shouldn't conflict"; + environment.etc."xrdp/test.txt".text = "Shouldn't conflict"; - services.xrdp.enable = true; - services.xrdp.audio.enable = true; - services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; + services.xrdp.enable = true; + services.xrdp.audio.enable = true; + services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm"; - services.pulseaudio = { - enable = true; - }; + services.pulseaudio = { + enable = true; + }; - systemd.user.services.pactl-list = { - script = '' - while [ ! -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]; do - sleep 1 - done + systemd.user.services.pactl-list = { + script = '' + while [ ! -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]; do sleep 1 - ${pkgs.pulseaudio}/bin/pactl list - echo Source: - ${pkgs.pulseaudio}/bin/pactl get-default-source | tee /tmp/pulseaudio-source - echo Sink: - ${pkgs.pulseaudio}/bin/pactl get-default-sink | tee /tmp/pulseaudio-sink + done + sleep 1 + ${pkgs.pulseaudio}/bin/pactl list + echo Source: + ${pkgs.pulseaudio}/bin/pactl get-default-source | tee /tmp/pulseaudio-source + echo Sink: + ${pkgs.pulseaudio}/bin/pactl get-default-sink | tee /tmp/pulseaudio-sink - ''; - wantedBy = [ "default.target" ]; - }; - - networking.firewall.allowedTCPPorts = [ 3389 ]; + ''; + wantedBy = [ "default.target" ]; }; - client = - { pkgs, ... }: - { - imports = [ - ./common/x11.nix - ./common/user-account.nix - ]; - test-support.displayManager.auto.user = "alice"; + networking.firewall.allowedTCPPorts = [ 3389 ]; + }; - environment.systemPackages = [ pkgs.freerdp ]; + client = + { pkgs, ... }: + { + imports = [ + ./common/x11.nix + ./common/user-account.nix + ]; + test-support.displayManager.auto.user = "alice"; - services.xrdp.enable = true; - services.xrdp.audio.enable = true; - services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm"; + environment.systemPackages = [ pkgs.freerdp ]; - services.pulseaudio = { - enable = true; - }; + services.xrdp.enable = true; + services.xrdp.audio.enable = true; + services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm"; + + services.pulseaudio = { + enable = true; }; - }; + }; + }; - testScript = - { nodes, ... }: - let - user = nodes.client.config.users.users.alice; - in - '' - start_all() + testScript = + { nodes, ... }: + let + user = nodes.client.config.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.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} /sound\n") + client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password} /sound\n") - client.sleep(10) + client.sleep(10) - client.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket - client.sleep(5) - client.screenshot("localrdp") + client.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket + 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} /sound\n") - client.sleep(10) + 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} /sound\n") + client.sleep(10) - server.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket - server.succeed('[ "$(cat /tmp/pulseaudio-source)" == "xrdp-source" ]') - server.succeed('[ "$(cat /tmp/pulseaudio-sink)" == "xrdp-sink" ]') - client.screenshot("remoterdp") - ''; - } -) + server.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket + server.succeed('[ "$(cat /tmp/pulseaudio-source)" == "xrdp-source" ]') + server.succeed('[ "$(cat /tmp/pulseaudio-sink)" == "xrdp-sink" ]') + client.screenshot("remoterdp") + ''; +}