commit 6d1946030c931e26b0d1431057249f60e49b34e6 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1292
       1292
        
         xmonad = handleTest ./xmonad.nix {};

     

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

     

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

     

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

     

       1295
       1295
       +
         xrdp = runTest ./xrdp.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;

+51 -53

nixos/tests/xrdp.nix

···

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

     

       2
       2
       -
         { pkgs, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "xrdp";

     

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

     

       6
       6
       -
             maintainers = [ ];

     

       7
       7
       -
           };

     

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "xrdp";

     

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

     

       5
       5
       +
           maintainers = [ ];

     

       6
       6
       +
         };

     

       8
       7
        
       

     

       9
       9
       -
           nodes = {

     

       10
       10
       -
             server =

     

       11
       11
       -
               { pkgs, ... }:

     

       12
       12
       -
               {

     

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

     

       14
       14
       -
                 services.xrdp.enable = true;

     

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

     

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

     

       17
       17
       -
               };

     

       8
       8
       +
         nodes = {

     

       9
       9
       +
           server =

     

       10
       10
       +
             { pkgs, ... }:

     

       11
       11
       +
             {

     

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

     

       13
       13
       +
               services.xrdp.enable = true;

     

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

     

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

     

       16
       16
       +
             };

     

       18
       17
        
       

     

       19
       19
       -
             client =

     

       20
       20
       -
               { pkgs, ... }:

     

       21
       21
       -
               {

     

       22
       22
       -
                 imports = [

     

       23
       23
       -
                   ./common/x11.nix

     

       24
       24
       -
                   ./common/user-account.nix

     

       25
       25
       -
                 ];

     

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

     

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

     

       28
       28
       -
                 services.xrdp.enable = true;

     

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

     

       30
       30
       -
               };

     

       31
       31
       -
           };

     

       18
       18
       +
           client =

     

       19
       19
       +
             { pkgs, ... }:

     

       20
       20
       +
             {

     

       21
       21
       +
               imports = [

     

       22
       22
       +
                 ./common/x11.nix

     

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

     

       24
       24
       +
               ];

     

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

     

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

     

       27
       27
       +
               services.xrdp.enable = true;

     

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

     

       29
       29
       +
             };

     

       30
       30
       +
         };

     

       32
       31
        
       

     

       33
       33
       -
           testScript =

     

       34
       34
       -
             { nodes, ... }:

     

       35
       35
       -
             let

     

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

     

       37
       37
       -
             in

     

       38
       38
       -
             ''

     

       39
       39
       -
               start_all()

     

       32
       32
       +
         testScript =

     

       33
       33
       +
           { nodes, ... }:

     

       34
       34
       +
           let

     

       35
       35
       +
             user = nodes.client.users.users.alice;

     

       36
       36
       +
           in

     

       37
       37
       +
           ''

     

       38
       38
       +
             start_all()

     

       40
       39
        
       

     

       41
       41
       -
               client.wait_for_x()

     

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

     

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

     

       40
       40
       +
             client.wait_for_x()

     

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

     

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

     

       44
       43
        
       

     

       45
       45
       -
               client.sleep(5)

     

       44
       44
       +
             client.sleep(5)

     

       46
       45
        
       

     

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

     

       48
       48
       -
               client.sleep(1)

     

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

     

       50
       50
       -
               client.sleep(5)

     

       51
       51
       -
               client.screenshot("localrdp")

     

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

     

       47
       47
       +
             client.sleep(1)

     

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

     

       49
       49
       +
             client.sleep(5)

     

       50
       50
       +
             client.screenshot("localrdp")

     

       52
       51
        
       

     

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

     

       54
       54
       -
               client.sleep(1)

     

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

     

       56
       56
       -
               client.sleep(5)

     

       57
       57
       -
               client.screenshot("remoterdp")

     

       58
       58
       -
             '';

     

       59
       59
       -
         }

     

       60
       60
       -
       )

     

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

     

       53
       53
       +
             client.sleep(1)

     

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

     

       55
       55
       +
             client.sleep(5)

     

       56
       56
       +
             client.screenshot("remoterdp")

     

       57
       57
       +
           '';

     

       58
       58
       +
       }