commit 9153d8ed640e4df38422cad89a72a43c9df9f057 · pyrox.dev/nixpkgs

+1 -1

nixos/lib/test-driver/Machine.pm

···

       543
       543
        
               retry sub {

     

       544
       544
        
                   my ($status, $out) = $self->execute("journalctl -b SYSLOG_IDENTIFIER=systemd | grep 'session opened'");

     

       545
       545
        
                   return 0 if $status != 0;

     

       546
       546
       -
                   ($status, $out) = $self->execute("xwininfo -root > /dev/null 2>&1");

     

       546
       546
       +
                   ($status, $out) = $self->execute("[ -e /tmp/.X11-unix/X0 ]");

     

       547
       547
        
                   return 1 if $status == 0;

     

       548
       548
        
               }

     

       549
       549
        
           });

+1

nixos/modules/services/x11/xserver.nix

···

       466
       466
        
               xorg.xsetroot

     

       467
       467
        
               xorg.xinput

     

       468
       468
        
               xorg.xprop

     

       469
       469
       +
               xorg.xauth

     

       469
       470
        
               pkgs.xterm

     

       470
       471
        
               pkgs.xdg_utils

     

       471
       472
        
             ]

+1

nixos/tests/gnome3-gdm.nix

···

       32
       32
        
             $machine->succeed("getfacl /dev/snd/timer | grep -q alice");

     

       33
       33
        
       

     

       34
       34
        
             $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");

     

       35
       35
       +
             $machine->succeed("xauth merge ~alice/.Xauthority");

     

       35
       36
        
             $machine->waitForWindow(qr/Terminal/);

     

       36
       37
        
             $machine->sleep(20);

     

       37
       38
        
             $machine->screenshot("screen");

+1

nixos/tests/gnome3.nix

···

       27
       27
        
             $machine->succeed("getfacl /dev/snd/timer | grep -q alice");

     

       28
       28
        
       

     

       29
       29
        
             $machine->succeed("su - alice -c 'DISPLAY=:0.0 gnome-terminal &'");

     

       30
       30
       +
             $machine->succeed("xauth merge ~alice/.Xauthority");

     

       30
       31
        
             $machine->waitForWindow(qr/Terminal/);

     

       31
       32
        
             $machine->mustSucceed("timeout 900 bash -c 'journalctl -f|grep -m 1 \"GNOME Shell started\"'");

     

       32
       33
        
             $machine->sleep(10);

+2

nixos/tests/i3wm.nix

···

       13
       13
        
       

     

       14
       14
        
         testScript = { nodes, ... }: ''

     

       15
       15
        
           $machine->waitForX;

     

       16
       16
       +
           $machine->waitForFile("/home/alice/.Xauthority");

     

       17
       17
       +
           $machine->succeed("xauth merge ~alice/.Xauthority");

     

       16
       18
        
           $machine->waitForWindow(qr/first configuration/);

     

       17
       19
        
           $machine->sleep(1);

     

       18
       20
        
           $machine->screenshot("started");

+4 -2

nixos/tests/kde4.nix

···

       41
       41
        
                 pkgs.kde4.kdenetwork

     

       42
       42
        
                 pkgs.kde4.kdetoys

     

       43
       43
        
                 pkgs.kde4.kdewebdev

     

       44
       44
       +
                 pkgs.xorg.xmessage

     

       44
       45
        
               ];

     

       45
       46
        
           };

     

       46
       47
        
       

     

       47
       47
       -
         testScript = '' 

     

       48
       48
       +
         testScript = ''

     

       48
       49
        
             $machine->waitUntilSucceeds("pgrep plasma-desktop");

     

       50
       50
       +
             $machine->succeed("xauth merge ~alice/.Xauthority");

     

       49
       51
        
             $machine->waitForWindow(qr/plasma-desktop/);

     

       50
       52
        
       

     

       51
       53
        
             # Check that logging in has given the user ownership of devices.

     
···

       62
       64
        
       

     

       63
       65
        
             $machine->sleep(10);

     

       64
       66
        
       

     

       65
       65
       -
             $machine->screenshot("screen"); 

     

       67
       67
       +
             $machine->screenshot("screen");

     

       66
       68
        
           '';

     

       67
       69
        
       

     

       68
       70
        
       })

+2

nixos/tests/lightdm.nix

···

       22
       22
        
           $machine->waitForText(qr/${user.description}/);

     

       23
       23
        
           $machine->screenshot("lightdm");

     

       24
       24
        
           $machine->sendChars("${user.password}\n");

     

       25
       25
       +
           $machine->waitForFile("/home/alice/.Xauthority");

     

       26
       26
       +
           $machine->succeed("xauth merge ~alice/.Xauthority");

     

       25
       27
        
           $machine->waitForWindow("^IceWM ");

     

       26
       28
        
         '';

     

       27
       29
        
       })

+2

nixos/tests/sddm-kde5.nix

···

       24
       24
        
       

     

       25
       25
        
         testScript = { nodes, ... }: ''

     

       26
       26
        
           startAll;

     

       27
       27
       +
           $machine->waitForFile("/home/alice/.Xauthority");

     

       28
       28
       +
           $machine->succeed("xauth merge ~alice/.Xauthority");

     

       27
       29
        
           $machine->waitForWindow("^IceWM ");

     

       28
       30
        
         '';

     

       29
       31
        
       })

+2

nixos/tests/sddm.nix

···

       23
       23
        
       

     

       24
       24
        
         testScript = { nodes, ... }: ''

     

       25
       25
        
           startAll;

     

       26
       26
       +
           $machine->waitForFile("/home/alice/.Xauthority");

     

       27
       27
       +
           $machine->succeed("xauth merge ~alice/.Xauthority");

     

       26
       28
        
           $machine->waitForWindow("^IceWM ");

     

       27
       29
        
         '';

     

       28
       30
        
       })

+2

nixos/tests/xfce.nix

···

       20
       20
        
         testScript =

     

       21
       21
        
           ''

     

       22
       22
        
             $machine->waitForX;

     

       23
       23
       +
             $machine->waitForFile("/home/alice/.Xauthority");

     

       24
       24
       +
             $machine->succeed("xauth merge ~alice/.Xauthority");

     

       23
       25
        
             $machine->waitForWindow(qr/xfce4-panel/);

     

       24
       26
        
             $machine->sleep(10);

     

       25
       27