commit 2af95991abbfb7ca6dc0831cac3b105c13ef86a0 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1293
       1293
        
         xmonad-xdg-autostart = handleTest ./xmonad-xdg-autostart.nix {};

     

       1294
       1294
        
         xpadneo = handleTest ./xpadneo.nix {};

     

       1295
       1295
        
         xrdp = handleTest ./xrdp.nix {};

     

       1296
       1296
       -
         xrdp-with-audio-pulseaudio = handleTest ./xrdp-with-audio-pulseaudio.nix {};

     

       1296
       1296
       +
         xrdp-with-audio-pulseaudio = runTest ./xrdp-with-audio-pulseaudio.nix;

     

       1297
       1297
        
         xscreensaver = handleTest ./xscreensaver.nix {};

     

       1298
       1298
        
         xss-lock = runTest ./xss-lock.nix;

     

       1299
       1299
        
         xterm = runTest ./xterm.nix;

+84 -86

nixos/tests/xrdp-with-audio-pulseaudio.nix

···

       1
       1
       -
       import ./make-test-python.nix (

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           # How to interactively test this module if the audio actually works

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         # How to interactively test this module if the audio actually works

     

       5
       4
        
       

     

       6
       6
       -
           # - nix run .#pulseaudio-module-xrdp.tests.xrdp-with-audio-pulseaudio.driverInteractive

     

       7
       7
       -
           # - test_script() # launches the terminal and the tests itself

     

       8
       8
       -
           # - server.send_monitor_command("hostfwd_add tcp::3389-:3389") # forward the RDP port to the host

     

       9
       9
       -
           # - Connect with the RDP client you like (ex: Remmina)

     

       10
       10
       -
           # - Don't forget to enable audio support. In remmina: Advanced -> Audio output mode to Local (default is Off)

     

       11
       11
       -
           # - Open a browser or something that plays sound. Ex: chromium

     

       5
       5
       +
         # - nix run .#pulseaudio-module-xrdp.tests.xrdp-with-audio-pulseaudio.driverInteractive

     

       6
       6
       +
         # - test_script() # launches the terminal and the tests itself

     

       7
       7
       +
         # - server.send_monitor_command("hostfwd_add tcp::3389-:3389") # forward the RDP port to the host

     

       8
       8
       +
         # - Connect with the RDP client you like (ex: Remmina)

     

       9
       9
       +
         # - Don't forget to enable audio support. In remmina: Advanced -> Audio output mode to Local (default is Off)

     

       10
       10
       +
         # - Open a browser or something that plays sound. Ex: chromium

     

       12
       11
        
       

     

       13
       13
       -
           name = "xrdp-with-audio-pulseaudio";

     

       14
       14
       -
           meta = with pkgs.lib.maintainers; {

     

       15
       15
       -
             maintainers = [ lucasew ];

     

       16
       16
       -
           };

     

       12
       12
       +
         name = "xrdp-with-audio-pulseaudio";

     

       13
       13
       +
         meta = with pkgs.lib.maintainers; {

     

       14
       14
       +
           maintainers = [ lucasew ];

     

       15
       15
       +
         };

     

       17
       16
        
       

     

       18
       18
       -
           nodes = {

     

       19
       19
       -
             server =

     

       20
       20
       -
               { pkgs, ... }:

     

       21
       21
       -
               {

     

       22
       22
       -
                 imports = [ ./common/user-account.nix ];

     

       17
       17
       +
         nodes = {

     

       18
       18
       +
           server =

     

       19
       19
       +
             { pkgs, ... }:

     

       20
       20
       +
             {

     

       21
       21
       +
               imports = [ ./common/user-account.nix ];

     

       23
       22
        
       

     

       24
       24
       -
                 environment.etc."xrdp/test.txt".text = "Shouldn't conflict";

     

       23
       23
       +
               environment.etc."xrdp/test.txt".text = "Shouldn't conflict";

     

       25
       24
        
       

     

       26
       26
       -
                 services.xrdp.enable = true;

     

       27
       27
       -
                 services.xrdp.audio.enable = true;

     

       28
       28
       -
                 services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";

     

       25
       25
       +
               services.xrdp.enable = true;

     

       26
       26
       +
               services.xrdp.audio.enable = true;

     

       27
       27
       +
               services.xrdp.defaultWindowManager = "${pkgs.xterm}/bin/xterm";

     

       29
       28
        
       

     

       30
       30
       -
                 services.pulseaudio = {

     

       31
       31
       -
                   enable = true;

     

       32
       32
       -
                 };

     

       29
       29
       +
               services.pulseaudio = {

     

       30
       30
       +
                 enable = true;

     

       31
       31
       +
               };

     

       33
       32
        
       

     

       34
       34
       -
                 systemd.user.services.pactl-list = {

     

       35
       35
       -
                   script = ''

     

       36
       36
       -
                     while [ ! -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]; do

     

       37
       37
       -
                       sleep 1

     

       38
       38
       -
                     done

     

       33
       33
       +
               systemd.user.services.pactl-list = {

     

       34
       34
       +
                 script = ''

     

       35
       35
       +
                   while [ ! -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]; do

     

       39
       36
        
                     sleep 1

     

       40
       40
       -
                     ${pkgs.pulseaudio}/bin/pactl list

     

       41
       41
       -
                     echo Source:

     

       42
       42
       -
                     ${pkgs.pulseaudio}/bin/pactl get-default-source | tee /tmp/pulseaudio-source

     

       43
       43
       -
                     echo Sink:

     

       44
       44
       -
                     ${pkgs.pulseaudio}/bin/pactl get-default-sink | tee /tmp/pulseaudio-sink

     

       37
       37
       +
                   done

     

       38
       38
       +
                   sleep 1

     

       39
       39
       +
                   ${pkgs.pulseaudio}/bin/pactl list

     

       40
       40
       +
                   echo Source:

     

       41
       41
       +
                   ${pkgs.pulseaudio}/bin/pactl get-default-source | tee /tmp/pulseaudio-source

     

       42
       42
       +
                   echo Sink:

     

       43
       43
       +
                   ${pkgs.pulseaudio}/bin/pactl get-default-sink | tee /tmp/pulseaudio-sink

     

       45
       44
        
       

     

       46
       46
       -
                   '';

     

       47
       47
       -
                   wantedBy = [ "default.target" ];

     

       48
       48
       -
                 };

     

       49
       49
       -
       

     

       50
       50
       -
                 networking.firewall.allowedTCPPorts = [ 3389 ];

     

       45
       45
       +
                 '';

     

       46
       46
       +
                 wantedBy = [ "default.target" ];

     

       51
       47
        
               };

     

       52
       48
        
       

     

       53
       53
       -
             client =

     

       54
       54
       -
               { pkgs, ... }:

     

       55
       55
       -
               {

     

       56
       56
       -
                 imports = [

     

       57
       57
       -
                   ./common/x11.nix

     

       58
       58
       -
                   ./common/user-account.nix

     

       59
       59
       -
                 ];

     

       60
       60
       -
                 test-support.displayManager.auto.user = "alice";

     

       49
       49
       +
               networking.firewall.allowedTCPPorts = [ 3389 ];

     

       50
       50
       +
             };

     

       61
       51
        
       

     

       62
       62
       -
                 environment.systemPackages = [ pkgs.freerdp ];

     

       52
       52
       +
           client =

     

       53
       53
       +
             { pkgs, ... }:

     

       54
       54
       +
             {

     

       55
       55
       +
               imports = [

     

       56
       56
       +
                 ./common/x11.nix

     

       57
       57
       +
                 ./common/user-account.nix

     

       58
       58
       +
               ];

     

       59
       59
       +
               test-support.displayManager.auto.user = "alice";

     

       63
       60
        
       

     

       64
       64
       -
                 services.xrdp.enable = true;

     

       65
       65
       -
                 services.xrdp.audio.enable = true;

     

       66
       66
       -
                 services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";

     

       61
       61
       +
               environment.systemPackages = [ pkgs.freerdp ];

     

       62
       62
       +
       

     

       63
       63
       +
               services.xrdp.enable = true;

     

       64
       64
       +
               services.xrdp.audio.enable = true;

     

       65
       65
       +
               services.xrdp.defaultWindowManager = "${pkgs.icewm}/bin/icewm";

     

       67
       66
        
       

     

       68
       68
       -
                 services.pulseaudio = {

     

       69
       69
       -
                   enable = true;

     

       70
       70
       -
                 };

     

       67
       67
       +
               services.pulseaudio = {

     

       68
       68
       +
                 enable = true;

     

       71
       69
        
               };

     

       72
       72
       -
           };

     

       70
       70
       +
             };

     

       71
       71
       +
         };

     

       73
       72
        
       

     

       74
       74
       -
           testScript =

     

       75
       75
       -
             { nodes, ... }:

     

       76
       76
       -
             let

     

       77
       77
       -
               user = nodes.client.config.users.users.alice;

     

       78
       78
       -
             in

     

       79
       79
       -
             ''

     

       80
       80
       -
               start_all()

     

       73
       73
       +
         testScript =

     

       74
       74
       +
           { nodes, ... }:

     

       75
       75
       +
           let

     

       76
       76
       +
             user = nodes.client.config.users.users.alice;

     

       77
       77
       +
           in

     

       78
       78
       +
           ''

     

       79
       79
       +
             start_all()

     

       81
       80
        
       

     

       82
       82
       -
               client.wait_for_x()

     

       83
       83
       -
               client.wait_for_file("${user.home}/.Xauthority")

     

       84
       84
       -
               client.succeed("xauth merge ${user.home}/.Xauthority")

     

       81
       81
       +
             client.wait_for_x()

     

       82
       82
       +
             client.wait_for_file("${user.home}/.Xauthority")

     

       83
       83
       +
             client.succeed("xauth merge ${user.home}/.Xauthority")

     

       85
       84
        
       

     

       86
       86
       -
               client.sleep(5)

     

       85
       85
       +
             client.sleep(5)

     

       87
       86
        
       

     

       88
       88
       -
               client.execute("xterm >&2 &")

     

       89
       89
       -
               client.sleep(1)

     

       87
       87
       +
             client.execute("xterm >&2 &")

     

       88
       88
       +
             client.sleep(1)

     

       90
       89
        
       

     

       91
       91
       -
               client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password} /sound\n")

     

       90
       90
       +
             client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:127.0.0.1 /u:${user.name} /p:${user.password} /sound\n")

     

       92
       91
        
       

     

       93
       93
       -
               client.sleep(10)

     

       92
       92
       +
             client.sleep(10)

     

       94
       93
        
       

     

       95
       95
       -
               client.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket

     

       96
       96
       -
               client.sleep(5)

     

       97
       97
       -
               client.screenshot("localrdp")

     

       94
       94
       +
             client.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket

     

       95
       95
       +
             client.sleep(5)

     

       96
       96
       +
             client.screenshot("localrdp")

     

       98
       97
        
       

     

       99
       99
       -
               client.execute("xterm >&2 &")

     

       100
       100
       -
               client.sleep(1)

     

       101
       101
       -
               client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password} /sound\n")

     

       102
       102
       -
               client.sleep(10)

     

       98
       98
       +
             client.execute("xterm >&2 &")

     

       99
       99
       +
             client.sleep(1)

     

       100
       100
       +
             client.send_chars("xfreerdp /cert-tofu /w:640 /h:480 /v:server /u:${user.name} /p:${user.password} /sound\n")

     

       101
       101
       +
             client.sleep(10)

     

       103
       102
        
       

     

       104
       104
       -
               server.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket

     

       105
       105
       -
               server.succeed('[ "$(cat /tmp/pulseaudio-source)" == "xrdp-source" ]')

     

       106
       106
       -
               server.succeed('[ "$(cat /tmp/pulseaudio-sink)" == "xrdp-sink" ]')

     

       107
       107
       -
               client.screenshot("remoterdp")

     

       108
       108
       -
             '';

     

       109
       109
       -
         }

     

       110
       110
       -
       )

     

       103
       103
       +
             server.succeed("[ -S /tmp/.xrdp/xrdp_chansrv_audio_in_socket_* ]") # checks if it's a socket

     

       104
       104
       +
             server.succeed('[ "$(cat /tmp/pulseaudio-source)" == "xrdp-source" ]')

     

       105
       105
       +
             server.succeed('[ "$(cat /tmp/pulseaudio-sink)" == "xrdp-sink" ]')

     

       106
       106
       +
             client.screenshot("remoterdp")

     

       107
       107
       +
           '';

     

       108
       108
       +
       }