commit 2fc57ae6702b9f74d18a8cd94746962816984904 · pyrox.dev/nixpkgs

+3 -2

nixos/tests/maestral.nix

···

       52
       52
        
       

     

       53
       53
        
         testScript = { nodes, ... }:

     

       54
       54
        
           let

     

       55
       55
       -
             user = nodes.cli.config.users.users.alice;

     

       55
       55
       +
             user = nodes.cli.users.users.alice;

     

       56
       56
        
           in

     

       57
       57
        
           ''

     

       58
       58
        
             start_all()

     
···

       65
       65
        
       

     

       66
       66
        
             with subtest("GUI"):

     

       67
       67
        
               gui.wait_for_x()

     

       68
       68
       -
               gui.succeed("xauth merge ${user.home}/.Xauthority")

     

       68
       68
       +
               gui.wait_for_file("/tmp/xauth_*")

     

       69
       69
       +
               gui.succeed("xauth merge /tmp/xauth_*")

     

       69
       70
        
               gui.wait_for_window("^Desktop ")

     

       70
       71
        
               gui.wait_for_unit("maestral.service", "${user.name}")

     

       71
       72
        
           '';

+3 -6

nixos/tests/plasma-bigscreen.nix

···

       22
       22
        
           users.users.alice.extraGroups = ["uinput"];

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
       -
         testScript = { nodes, ... }: let

     

       26
       26
       -
           user = nodes.machine.users.users.alice;

     

       27
       27
       -
           xdo = "${pkgs.xdotool}/bin/xdotool";

     

       28
       28
       -
         in ''

     

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

     

       29
       26
        
           with subtest("Wait for login"):

     

       30
       27
        
               start_all()

     

       31
       31
       -
               machine.wait_for_file("${user.home}/.Xauthority")

     

       32
       32
       -
               machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       28
       28
       +
               machine.wait_for_file("/tmp/xauth_*")

     

       29
       29
       +
               machine.succeed("xauth merge /tmp/xauth_*")

     

       33
       30
        
       

     

       34
       31
        
           with subtest("Check plasmashell started"):

     

       35
       32
        
               machine.wait_until_succeeds("pgrep plasmashell")

+3 -5

nixos/tests/plasma5-systemd-start.nix

···

       23
       23
        
           };

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
       -
         testScript = { nodes, ... }: let

     

       27
       27
       -
           user = nodes.machine.config.users.users.alice;

     

       28
       28
       -
         in ''

     

       26
       26
       +
         testScript = { nodes, ... }: ''

     

       29
       27
        
           with subtest("Wait for login"):

     

       30
       28
        
               start_all()

     

       31
       31
       -
               machine.wait_for_file("${user.home}/.Xauthority")

     

       32
       32
       -
               machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       29
       29
       +
               machine.wait_for_file("/tmp/xauth_*")

     

       30
       30
       +
               machine.succeed("xauth merge /tmp/xauth_*")

     

       33
       31
        
       

     

       34
       32
        
           with subtest("Check plasmashell started"):

     

       35
       33
        
               machine.wait_until_succeeds("pgrep plasmashell")

+7 -7

nixos/tests/plasma5.nix

···

       13
       13
        
           services.xserver.enable = true;

     

       14
       14
        
           services.xserver.displayManager.sddm.enable = true;

     

       15
       15
        
           services.xserver.displayManager.defaultSession = "plasma";

     

       16
       16
       -
           services.xserver.desktopManager.plasma5 = {

     

       17
       17
       -
             enable = true;

     

       18
       18
       -
             excludePackages = [ pkgs.plasma5Packages.elisa ];

     

       19
       19
       -
           };

     

       16
       16
       +
           services.xserver.desktopManager.plasma5.enable = true;

     

       17
       17
       +
           environment.plasma5.excludePackages = [ pkgs.plasma5Packages.elisa ];

     

       20
       18
        
           services.xserver.displayManager.autoLogin = {

     

       21
       19
        
             enable = true;

     

       22
       20
        
             user = "alice";

     
···

       25
       23
        
         };

     

       26
       24
        
       

     

       27
       25
        
         testScript = { nodes, ... }: let

     

       28
       28
       -
           user = nodes.machine.config.users.users.alice;

     

       26
       26
       +
           user = nodes.machine.users.users.alice;

     

       29
       27
        
           xdo = "${pkgs.xdotool}/bin/xdotool";

     

       30
       28
        
         in ''

     

       31
       29
        
           with subtest("Wait for login"):

     

       32
       30
        
               start_all()

     

       33
       33
       -
               machine.wait_for_file("${user.home}/.Xauthority")

     

       34
       34
       -
               machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       31
       31
       +
               machine.wait_for_file("/tmp/xauth_*")

     

       32
       32
       +
               machine.succeed("xauth merge /tmp/xauth_*")

     

       35
       33
        
       

     

       36
       34
        
           with subtest("Check plasmashell started"):

     

       37
       35
        
               machine.wait_until_succeeds("pgrep plasmashell")

     
···

       45
       43
        
       

     

       46
       44
        
           with subtest("Ensure Elisa is not installed"):

     

       47
       45
        
               machine.fail("which elisa")

     

       46
       46
       +
       

     

       47
       47
       +
           machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")

     

       48
       48
        
       

     

       49
       49
        
           with subtest("Run Dolphin"):

     

       50
       50
        
               machine.execute("su - ${user.name} -c 'DISPLAY=:0.0 dolphin >&2 &'")

+2 -2

nixos/tests/retroarch.nix

···

       30
       30
        
             in ''

     

       31
       31
        
               with subtest("Wait for login"):

     

       32
       32
        
                   start_all()

     

       33
       33
       -
                   machine.wait_for_file("${user.home}/.Xauthority")

     

       34
       34
       -
                   machine.succeed("xauth merge ${user.home}/.Xauthority")

     

       33
       33
       +
                   machine.wait_for_file("/tmp/xauth_*")

     

       34
       34
       +
                   machine.succeed("xauth merge /tmp/xauth_*")

     

       35
       35
        
       

     

       36
       36
        
               with subtest("Check RetroArch started"):

     

       37
       37
        
                   machine.wait_until_succeeds("pgrep retroarch")