commit c643fa96155cad1a549a13001b4d8187b62725d6 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       524
       524
        
         glances = runTest ./glances.nix;

     

       525
       525
        
         glitchtip = runTest ./glitchtip.nix;

     

       526
       526
        
         glusterfs = handleTest ./glusterfs.nix { };

     

       527
       527
       -
         gnome = handleTest ./gnome.nix { };

     

       527
       527
       +
         gnome = runTest ./gnome.nix;

     

       528
       528
        
         gnome-extensions = handleTest ./gnome-extensions.nix { };

     

       529
       529
        
         gnome-flashback = handleTest ./gnome-flashback.nix { };

     

       530
       530
        
         gnome-xorg = handleTest ./gnome-xorg.nix { };

+83 -85

nixos/tests/gnome.nix

···

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

     

       2
       2
       -
         { pkgs, lib, ... }:

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "gnome";

     

       5
       5
       -
           meta.maintainers = lib.teams.gnome.members;

     

       1
       1
       +
       { pkgs, lib, ... }:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "gnome";

     

       4
       4
       +
         meta.maintainers = lib.teams.gnome.members;

     

       6
       5
        
       

     

       7
       7
       -
           nodes.machine =

     

       8
       8
       -
             { ... }:

     

       6
       6
       +
         nodes.machine =

     

       7
       7
       +
           { ... }:

     

       9
       8
        
       

     

       10
       10
       -
             {

     

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

     

       9
       9
       +
           {

     

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

     

       12
       11
        
       

     

       13
       13
       -
               services.xserver.enable = true;

     

       12
       12
       +
             services.xserver.enable = true;

     

       14
       13
        
       

     

       15
       15
       -
               services.xserver.displayManager = {

     

       16
       16
       -
                 gdm.enable = true;

     

       17
       17
       -
                 gdm.debug = true;

     

       18
       18
       -
               };

     

       14
       14
       +
             services.xserver.displayManager = {

     

       15
       15
       +
               gdm.enable = true;

     

       16
       16
       +
               gdm.debug = true;

     

       17
       17
       +
             };

     

       19
       18
        
       

     

       20
       20
       -
               services.displayManager.autoLogin = {

     

       21
       21
       -
                 enable = true;

     

       22
       22
       -
                 user = "alice";

     

       23
       23
       -
               };

     

       19
       19
       +
             services.displayManager.autoLogin = {

     

       20
       20
       +
               enable = true;

     

       21
       21
       +
               user = "alice";

     

       22
       22
       +
             };

     

       24
       23
        
       

     

       25
       25
       -
               services.xserver.desktopManager.gnome.enable = true;

     

       26
       26
       -
               services.xserver.desktopManager.gnome.debug = true;

     

       24
       24
       +
             services.xserver.desktopManager.gnome.enable = true;

     

       25
       25
       +
             services.xserver.desktopManager.gnome.debug = true;

     

       27
       26
        
       

     

       28
       28
       -
               systemd.user.services = {

     

       29
       29
       -
                 "org.gnome.Shell@wayland" = {

     

       30
       30
       -
                   serviceConfig = {

     

       31
       31
       -
                     ExecStart = [

     

       32
       32
       -
                       # Clear the list before overriding it.

     

       33
       33
       -
                       ""

     

       34
       34
       -
                       # Eval API is now internal so Shell needs to run in unsafe mode.

     

       35
       35
       -
                       # TODO: improve test driver so that it supports openqa-like manipulation

     

       36
       36
       -
                       # that would allow us to drop this mess.

     

       37
       37
       -
                       "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"

     

       38
       38
       -
                     ];

     

       39
       39
       -
                   };

     

       27
       27
       +
             systemd.user.services = {

     

       28
       28
       +
               "org.gnome.Shell@wayland" = {

     

       29
       29
       +
                 serviceConfig = {

     

       30
       30
       +
                   ExecStart = [

     

       31
       31
       +
                     # Clear the list before overriding it.

     

       32
       32
       +
                     ""

     

       33
       33
       +
                     # Eval API is now internal so Shell needs to run in unsafe mode.

     

       34
       34
       +
                     # TODO: improve test driver so that it supports openqa-like manipulation

     

       35
       35
       +
                     # that would allow us to drop this mess.

     

       36
       36
       +
                     "${pkgs.gnome-shell}/bin/gnome-shell --unsafe-mode"

     

       37
       37
       +
                   ];

     

       40
       38
        
                 };

     

       41
       39
        
               };

     

       42
       42
       -
       

     

       43
       40
        
             };

     

       44
       41
        
       

     

       45
       45
       -
           testScript =

     

       46
       46
       -
             { nodes, ... }:

     

       47
       47
       -
             let

     

       48
       48
       -
               # Keep line widths somewhat manageable

     

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

     

       50
       50
       -
               uid = toString user.uid;

     

       51
       51
       -
               bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";

     

       52
       52
       -
               # Run a command in the appropriate user environment

     

       53
       53
       -
               run = command: "su - ${user.name} -c '${bus} ${command}'";

     

       42
       42
       +
           };

     

       54
       43
        
       

     

       55
       55
       -
               # Call javascript in gnome shell, returns a tuple (success, output), where

     

       56
       56
       -
               # `success` is true if the dbus call was successful and output is what the

     

       57
       57
       -
               # javascript evaluates to.

     

       58
       58
       -
               eval =

     

       59
       59
       -
                 command:

     

       60
       60
       -
                 run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}";

     

       44
       44
       +
         testScript =

     

       45
       45
       +
           { nodes, ... }:

     

       46
       46
       +
           let

     

       47
       47
       +
             # Keep line widths somewhat manageable

     

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

     

       49
       49
       +
             uid = toString user.uid;

     

       50
       50
       +
             bus = "DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/${uid}/bus";

     

       51
       51
       +
             # Run a command in the appropriate user environment

     

       52
       52
       +
             run = command: "su - ${user.name} -c '${bus} ${command}'";

     

       61
       53
        
       

     

       62
       62
       -
               # False when startup is done

     

       63
       63
       -
               startingUp = eval "Main.layoutManager._startingUp";

     

       54
       54
       +
             # Call javascript in gnome shell, returns a tuple (success, output), where

     

       55
       55
       +
             # `success` is true if the dbus call was successful and output is what the

     

       56
       56
       +
             # javascript evaluates to.

     

       57
       57
       +
             eval =

     

       58
       58
       +
               command:

     

       59
       59
       +
               run "gdbus call --session -d org.gnome.Shell -o /org/gnome/Shell -m org.gnome.Shell.Eval ${command}";

     

       64
       60
        
       

     

       65
       65
       -
               # Start Console

     

       66
       66
       -
               launchConsole = run "gapplication launch org.gnome.Console";

     

       61
       61
       +
             # False when startup is done

     

       62
       62
       +
             startingUp = eval "Main.layoutManager._startingUp";

     

       67
       63
        
       

     

       68
       68
       -
               # Hopefully Console's wm class

     

       69
       69
       -
               wmClass = eval "global.display.focus_window.wm_class";

     

       70
       70
       -
             in

     

       71
       71
       -
             ''

     

       72
       72
       -
               with subtest("Login to GNOME with GDM"):

     

       73
       73
       -
                   # wait for gdm to start

     

       74
       74
       -
                   machine.wait_for_unit("display-manager.service")

     

       75
       75
       -
                   # wait for the wayland server

     

       76
       76
       -
                   machine.wait_for_file("/run/user/${uid}/wayland-0")

     

       77
       77
       -
                   # wait for alice to be logged in

     

       78
       78
       -
                   machine.wait_for_unit("default.target", "${user.name}")

     

       79
       79
       -
                   # check that logging in has given the user ownership of devices

     

       80
       80
       -
                   assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")

     

       64
       64
       +
             # Start Console

     

       65
       65
       +
             launchConsole = run "gapplication launch org.gnome.Console";

     

       81
       66
        
       

     

       82
       82
       -
               with subtest("Wait for GNOME Shell"):

     

       83
       83
       -
                   # correct output should be (true, 'false')

     

       84
       84
       -
                   machine.wait_until_succeeds(

     

       85
       85
       -
                       "${startingUp} | grep -q 'true,..false'"

     

       86
       86
       -
                   )

     

       67
       67
       +
             # Hopefully Console's wm class

     

       68
       68
       +
             wmClass = eval "global.display.focus_window.wm_class";

     

       69
       69
       +
           in

     

       70
       70
       +
           ''

     

       71
       71
       +
             with subtest("Login to GNOME with GDM"):

     

       72
       72
       +
                 # wait for gdm to start

     

       73
       73
       +
                 machine.wait_for_unit("display-manager.service")

     

       74
       74
       +
                 # wait for the wayland server

     

       75
       75
       +
                 machine.wait_for_file("/run/user/${uid}/wayland-0")

     

       76
       76
       +
                 # wait for alice to be logged in

     

       77
       77
       +
                 machine.wait_for_unit("default.target", "${user.name}")

     

       78
       78
       +
                 # check that logging in has given the user ownership of devices

     

       79
       79
       +
                 assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")

     

       87
       80
        
       

     

       88
       88
       -
               with subtest("Open Console"):

     

       89
       89
       -
                   # Close the Activities view so that Shell can correctly track the focused window.

     

       90
       90
       -
                   machine.send_key("esc")

     

       81
       81
       +
             with subtest("Wait for GNOME Shell"):

     

       82
       82
       +
                 # correct output should be (true, 'false')

     

       83
       83
       +
                 machine.wait_until_succeeds(

     

       84
       84
       +
                     "${startingUp} | grep -q 'true,..false'"

     

       85
       85
       +
                 )

     

       91
       86
        
       

     

       92
       92
       -
                   machine.succeed(

     

       93
       93
       -
                       "${launchConsole}"

     

       94
       94
       -
                   )

     

       95
       95
       -
                   # correct output should be (true, '"org.gnome.Console"')

     

       96
       96
       -
                   machine.wait_until_succeeds(

     

       97
       97
       -
                       "${wmClass} | grep -q 'true,...org.gnome.Console'"

     

       98
       98
       -
                   )

     

       99
       99
       -
                   machine.sleep(20)

     

       100
       100
       -
                   machine.screenshot("screen")

     

       101
       101
       -
             '';

     

       102
       102
       -
         }

     

       103
       103
       -
       )

     

       87
       87
       +
             with subtest("Open Console"):

     

       88
       88
       +
                 # Close the Activities view so that Shell can correctly track the focused window.

     

       89
       89
       +
                 machine.send_key("esc")

     

       90
       90
       +
       

     

       91
       91
       +
                 machine.succeed(

     

       92
       92
       +
                     "${launchConsole}"

     

       93
       93
       +
                 )

     

       94
       94
       +
                 # correct output should be (true, '"org.gnome.Console"')

     

       95
       95
       +
                 machine.wait_until_succeeds(

     

       96
       96
       +
                     "${wmClass} | grep -q 'true,...org.gnome.Console'"

     

       97
       97
       +
                 )

     

       98
       98
       +
                 machine.sleep(20)

     

       99
       99
       +
                 machine.screenshot("screen")

     

       100
       100
       +
           '';

     

       101
       101
       +
       }