commit a160ebdef3d1e65713f5e0598f2c0c04408a6e3a · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       1153
       1153
        
         systemd-userdbd = handleTest ./systemd-userdbd.nix {};

     

       1154
       1154
        
         systemd-homed = handleTest ./systemd-homed.nix {};

     

       1155
       1155
        
         systemtap = handleTest ./systemtap.nix {};

     

       1156
       1156
       -
         startx = runTest ./startx.nix;

     

       1156
       1156
       +
         startx = import ./startx.nix { inherit pkgs runTest; };

     

       1157
       1157
        
         taler = handleTest ./taler {};

     

       1158
       1158
        
         tandoor-recipes = handleTest ./tandoor-recipes.nix {};

     

       1159
       1159
        
         tandoor-recipes-script-name = handleTest ./tandoor-recipes-script-name.nix {};

+175 -83

nixos/tests/startx.nix

···

       1
       1
       -
       { lib, ... }:

     

       1
       1
       +
       { pkgs, runTest }:

     

       2
       2
        
       

     

       3
       3
        
       {

     

       4
       4
       -
         name = "startx";

     

       5
       5
       -
         meta.maintainers = with lib.maintainers; [ rnhmjoj ];

     

       4
       4
       +
       

     

       5
       5
       +
         declarative = runTest {

     

       6
       6
       +
           name = "startx";

     

       7
       7
       +
           meta.maintainers = with pkgs.lib.maintainers; [ rnhmjoj ];

     

       6
       8
        
       

     

       7
       7
       -
         nodes.machine =

     

       8
       8
       -
           { pkgs, ... }:

     

       9
       9
       -
           {

     

       10
       10
       -
             services.getty.autologinUser = "root";

     

       9
       9
       +
           nodes.machine =

     

       10
       10
       +
             { pkgs, ... }:

     

       11
       11
       +
             {

     

       12
       12
       +
               services.getty.autologinUser = "root";

     

       11
       13
        
       

     

       12
       12
       -
             environment.systemPackages = with pkgs; [

     

       13
       13
       -
               xdotool

     

       14
       14
       -
               catclock

     

       15
       15
       -
             ];

     

       14
       14
       +
               environment.systemPackages = with pkgs; [

     

       15
       15
       +
                 xdotool

     

       16
       16
       +
                 catclock

     

       17
       17
       +
               ];

     

       16
       18
        
       

     

       17
       17
       -
             programs.bash.promptInit = "PS1='# '";

     

       19
       19
       +
               programs.bash.promptInit = "PS1='# '";

     

       18
       20
        
       

     

       19
       19
       -
             # startx+bspwm setup

     

       20
       20
       -
             services.xserver = {

     

       21
       21
       -
               enable = true;

     

       22
       22
       -
               windowManager.bspwm = {

     

       21
       21
       +
               # startx+bspwm setup

     

       22
       22
       +
               services.xserver = {

     

       23
       23
        
                 enable = true;

     

       24
       24
       -
                 configFile = pkgs.writeShellScript "bspwrc" ''

     

       25
       25
       -
                   bspc config border_width 2

     

       26
       26
       -
                   bspc config window_gap 12

     

       27
       27
       -
                   bspc rule -a xclock state=floating sticky=on

     

       28
       28
       -
                 '';

     

       29
       29
       -
                 sxhkd.configFile = pkgs.writeText "sxhkdrc" ''

     

       30
       30
       -
                   # open a terminal

     

       31
       31
       -
                   super + Return

     

       32
       32
       -
                     urxvtc

     

       33
       33
       -
                   # quit bspwm

     

       34
       34
       -
                   super + alt + Escape

     

       35
       35
       -
                     bspc quit

     

       36
       36
       -
                 '';

     

       24
       24
       +
                 windowManager.bspwm = {

     

       25
       25
       +
                   enable = true;

     

       26
       26
       +
                   configFile = pkgs.writeShellScript "bspwrc" ''

     

       27
       27
       +
                     bspc config border_width 2

     

       28
       28
       +
                     bspc config window_gap 12

     

       29
       29
       +
                     bspc rule -a xclock state=floating sticky=on

     

       30
       30
       +
                   '';

     

       31
       31
       +
                   sxhkd.configFile = pkgs.writeText "sxhkdrc" ''

     

       32
       32
       +
                     # open a terminal

     

       33
       33
       +
                     super + Return

     

       34
       34
       +
                       urxvtc

     

       35
       35
       +
                     # quit bspwm

     

       36
       36
       +
                     super + alt + Escape

     

       37
       37
       +
                       bspc quit

     

       38
       38
       +
                   '';

     

       39
       39
       +
                 };

     

       40
       40
       +
                 displayManager.startx = {

     

       41
       41
       +
                   enable = true;

     

       42
       42
       +
                   generateScript = true;

     

       43
       43
       +
                   extraCommands = ''

     

       44
       44
       +
                     xrdb -load ~/.Xresources

     

       45
       45
       +
                     xsetroot -solid '#343d46'

     

       46
       46
       +
                     xsetroot -cursor_name trek

     

       47
       47
       +
                     xclock &

     

       48
       48
       +
                   '';

     

       49
       49
       +
                 };

     

       37
       50
        
               };

     

       38
       38
       -
               displayManager.startx = {

     

       51
       51
       +
       

     

       52
       52
       +
               # enable some user services

     

       53
       53
       +
               security.polkit.enable = true;

     

       54
       54
       +
               services.urxvtd.enable = true;

     

       55
       55
       +
               programs.xss-lock.enable = true;

     

       56
       56
       +
             };

     

       57
       57
       +
       

     

       58
       58
       +
           testScript = ''

     

       59
       59
       +
             import textwrap

     

       60
       60
       +
       

     

       61
       61
       +
             sysu = "env XDG_RUNTIME_DIR=/run/user/0 systemctl --user";

     

       62
       62
       +
             prompt = "# "

     

       63
       63
       +
       

     

       64
       64
       +
             with subtest("Wait for the autologin"):

     

       65
       65
       +
                 machine.wait_until_tty_matches("1", prompt)

     

       66
       66
       +
       

     

       67
       67
       +
             with subtest("Setup dotfiles"):

     

       68
       68
       +
                 machine.execute(textwrap.dedent("""

     

       69
       69
       +
                   cat <<EOF > ~/.Xresources

     

       70
       70
       +
                     urxvt*foreground: #9b9081

     

       71
       71
       +
                     urxvt*background: #181b20

     

       72
       72
       +
                     urxvt*scrollBar:  false

     

       73
       73
       +
                     urxvt*title:      myterm

     

       74
       74
       +
                     urxvt*geometry:   80x240+0+0

     

       75
       75
       +
                     xclock*geometry:  164x164+24+440

     

       76
       76
       +
                   EOF

     

       77
       77
       +
                 """))

     

       78
       78
       +
       

     

       79
       79
       +
             with subtest("Can start the X server"):

     

       80
       80
       +
                 machine.send_chars("startx\n")

     

       81
       81
       +
                 machine.wait_for_x()

     

       82
       82
       +
                 machine.wait_for_window("xclock")

     

       83
       83
       +
       

     

       84
       84
       +
             with subtest("Graphical services are running"):

     

       85
       85
       +
                 machine.succeed(f"{sysu} is-active graphical-session.target")

     

       86
       86
       +
                 machine.succeed(f"{sysu} is-active urxvtd")

     

       87
       87
       +
                 machine.succeed(f"{sysu} is-active xss-lock")

     

       88
       88
       +
       

     

       89
       89
       +
             with subtest("Can interact with the WM"):

     

       90
       90
       +
                 machine.wait_until_succeeds("pgrep sxhkd")

     

       91
       91
       +
                 machine.wait_until_succeeds("pgrep bspwm")

     

       92
       92
       +
                 # spawn some terminals

     

       93
       93
       +
                 machine.send_key("meta_l-ret", delay=0.5)

     

       94
       94
       +
                 machine.send_key("meta_l-ret", delay=0.5)

     

       95
       95
       +
                 machine.send_key("meta_l-ret", delay=0.5)

     

       96
       96
       +
                 # Note: this tests that resources have beeen loaded

     

       97
       97
       +
                 machine.wait_for_window("myterm")

     

       98
       98
       +
                 machine.screenshot("screenshot.png")

     

       99
       99
       +
       

     

       100
       100
       +
             with subtest("Can stop the X server"):

     

       101
       101
       +
                 # kill the WM

     

       102
       102
       +
                 machine.send_key("meta_l-alt-esc")

     

       103
       103
       +
                 machine.wait_until_tty_matches("1", prompt)

     

       104
       104
       +
       

     

       105
       105
       +
             with subtest("Graphical session has stopped"):

     

       106
       106
       +
                 machine.fail(f"{sysu} is-active graphical-session.target")

     

       107
       107
       +
                 machine.fail(f"{sysu} is-active urxvtd")

     

       108
       108
       +
                 machine.fail(f"{sysu} is-active xss-lock")

     

       109
       109
       +
           '';

     

       110
       110
       +
         };

     

       111
       111
       +
       

     

       112
       112
       +
         imperative = runTest {

     

       113
       113
       +
           name = "startx-imperative";

     

       114
       114
       +
           meta.maintainers = with pkgs.lib.maintainers; [ rnhmjoj ];

     

       115
       115
       +
       

     

       116
       116
       +
           nodes.machine =

     

       117
       117
       +
             { pkgs, ... }:

     

       118
       118
       +
             {

     

       119
       119
       +
               services.getty.autologinUser = "root";

     

       120
       120
       +
               programs.bash.promptInit = "PS1='# '";

     

       121
       121
       +
       

     

       122
       122
       +
               # startx+twm setup

     

       123
       123
       +
               services.xserver = {

     

       39
       124
        
                 enable = true;

     

       40
       40
       -
                 generateScript = true;

     

       41
       41
       -
                 extraCommands = ''

     

       42
       42
       -
                   xrdb -load ~/.Xresources

     

       43
       43
       -
                   xsetroot -solid '#343d46'

     

       44
       44
       -
                   xsetroot -cursor_name trek

     

       45
       45
       -
                   xclock &

     

       46
       46
       -
                 '';

     

       125
       125
       +
                 windowManager.twm.enable = true;

     

       126
       126
       +
                 displayManager.startx.enable = true;

     

       127
       127
       +
                 displayManager.startx.generateScript = false;

     

       47
       128
        
               };

     

       129
       129
       +
       

     

       130
       130
       +
               # enable some user services

     

       131
       131
       +
               security.polkit.enable = true;

     

       132
       132
       +
               services.urxvtd.enable = true;

     

       133
       133
       +
               programs.xss-lock.enable = true;

     

       48
       134
        
             };

     

       49
       135
        
       

     

       50
       50
       -
             # enable some user services

     

       51
       51
       -
             security.polkit.enable = true;

     

       52
       52
       -
             services.urxvtd.enable = true;

     

       53
       53
       -
             programs.xss-lock.enable = true;

     

       54
       54
       -
           };

     

       55
       55
       -
       

     

       56
       56
       -
         testScript = ''

     

       57
       57
       -
           import textwrap

     

       136
       136
       +
           testScript = ''

     

       137
       137
       +
             import textwrap

     

       58
       138
        
       

     

       59
       59
       -
           sysu = "env XDG_RUNTIME_DIR=/run/user/0 systemctl --user";

     

       60
       60
       -
           prompt = "# "

     

       139
       139
       +
             sysu = "env XDG_RUNTIME_DIR=/run/user/0 systemctl --user";

     

       140
       140
       +
             prompt = "# "

     

       61
       141
        
       

     

       62
       62
       -
           with subtest("Wait for the autologin"):

     

       63
       63
       -
               machine.wait_until_tty_matches("1", prompt)

     

       142
       142
       +
             with subtest("Wait for the autologin"):

     

       143
       143
       +
                 machine.wait_until_tty_matches("1", prompt)

     

       64
       144
        
       

     

       65
       65
       -
           with subtest("Setup dotfiles"):

     

       66
       66
       -
               machine.execute(textwrap.dedent("""

     

       67
       67
       -
                 cat <<EOF > ~/.Xresources

     

       145
       145
       +
             with subtest("Setup dotfiles"):

     

       146
       146
       +
                 machine.execute(textwrap.dedent("""

     

       147
       147
       +
                   cat <<EOF > ~/.Xresources

     

       68
       148
        
                   urxvt*foreground: #9b9081

     

       69
       149
        
                   urxvt*background: #181b20

     

       70
       150
        
                   urxvt*scrollBar:  false

     

       71
       151
        
                   urxvt*title:      myterm

     

       72
       72
       -
                   urxvt*geometry:   80x240+0+0

     

       73
       73
       -
                   xclock*geometry:  164x164+24+440

     

       74
       74
       -
                 EOF

     

       75
       75
       -
               """))

     

       152
       152
       +
                   urxvt*geometry:   20x20+40+40

     

       153
       153
       +
                   EOF

     

       154
       154
       +
                   cat <<EOF > ~/.twmrc

     

       155
       155
       +
                   "Return" = meta : all : f.exec "urxvtc"

     

       156
       156
       +
                   "Escape" = meta : all : f.quit

     

       157
       157
       +
                   EOF

     

       158
       158
       +
                   cat <<EOF > ~/.xinitrc

     

       159
       159
       +
                   xrdb -load ~/.Xresources

     

       160
       160
       +
                   xsetroot -solid '#343d46'

     

       161
       161
       +
                   xsetroot -cursor_name trek

     

       162
       162
       +
                   # start user services

     

       163
       163
       +
                   systemctl --user import-environment DISPLAY XDG_SESSION_ID

     

       164
       164
       +
                   systemctl --user start nixos-fake-graphical-session.target

     

       165
       165
       +
                   # run the window manager

     

       166
       166
       +
                   twm

     

       167
       167
       +
                   # stop services and all subprocesses

     

       168
       168
       +
                   systemctl --user stop nixos-fake-graphical-session.target

     

       169
       169
       +
                   EOF

     

       170
       170
       +
                 """))

     

       76
       171
        
       

     

       77
       77
       -
           with subtest("Can start the X server"):

     

       78
       78
       -
               machine.send_chars("startx\n")

     

       79
       79
       -
               machine.wait_for_x()

     

       80
       80
       -
               machine.wait_for_window("xclock")

     

       172
       172
       +
             with subtest("Can start the X server"):

     

       173
       173
       +
                 machine.send_chars("startx\n")

     

       174
       174
       +
                 machine.wait_for_x()

     

       81
       175
        
       

     

       82
       82
       -
           with subtest("Graphical services are running"):

     

       83
       83
       -
               machine.succeed(f"{sysu} is-active graphical-session.target")

     

       84
       84
       -
               machine.succeed(f"{sysu} is-active urxvtd")

     

       85
       85
       -
               machine.succeed(f"{sysu} is-active xss-lock")

     

       176
       176
       +
             with subtest("Graphical services are running"):

     

       177
       177
       +
                 machine.succeed(f"{sysu} is-active graphical-session.target")

     

       178
       178
       +
                 machine.succeed(f"{sysu} is-active urxvtd")

     

       179
       179
       +
                 machine.succeed(f"{sysu} is-active xss-lock")

     

       86
       180
        
       

     

       87
       87
       -
           with subtest("Can interact with the WM"):

     

       88
       88
       -
               machine.wait_until_succeeds("pgrep sxhkd")

     

       89
       89
       -
               machine.wait_until_succeeds("pgrep bspwm")

     

       90
       90
       -
               # spawn some terminals

     

       91
       91
       -
               machine.send_key("meta_l-ret", delay=0.5)

     

       92
       92
       -
               machine.send_key("meta_l-ret", delay=0.5)

     

       93
       93
       -
               machine.send_key("meta_l-ret", delay=0.5)

     

       94
       94
       -
               # Note: this tests that resources have beeen loaded

     

       95
       95
       -
               machine.wait_for_window("myterm")

     

       96
       96
       -
               machine.screenshot("screenshot.png")

     

       181
       181
       +
             with subtest("Can interact with the WM"):

     

       182
       182
       +
                 machine.wait_until_succeeds("pgrep twm")

     

       183
       183
       +
                 # spawn a terminal

     

       184
       184
       +
                 machine.send_key("alt-ret")

     

       185
       185
       +
                 machine.wait_for_window("myterm")

     

       186
       186
       +
                 machine.screenshot("screenshot.png")

     

       97
       187
        
       

     

       98
       98
       -
           with subtest("Can stop the X server"):

     

       99
       99
       -
               # kill the WM

     

       100
       100
       -
               machine.send_key("meta_l-alt-esc")

     

       101
       101
       -
               machine.wait_until_tty_matches("1", prompt)

     

       188
       188
       +
             with subtest("Can stop the X server"):

     

       189
       189
       +
                 # kill the WM

     

       190
       190
       +
                 machine.send_key("alt-esc")

     

       191
       191
       +
                 machine.wait_until_tty_matches("1", prompt)

     

       102
       192
        
       

     

       103
       103
       -
           with subtest("Graphical session has stopped"):

     

       104
       104
       -
               machine.fail(f"{sysu} is-active graphical-session.target")

     

       105
       105
       -
               machine.fail(f"{sysu} is-active urxvtd")

     

       106
       106
       -
               machine.fail(f"{sysu} is-active xss-lock")

     

       107
       107
       -
         '';

     

       193
       193
       +
             with subtest("Graphical session has stopped"):

     

       194
       194
       +
                 machine.fail(f"{sysu} is-active graphical-session.target")

     

       195
       195
       +
                 machine.fail(f"{sysu} is-active urxvtd")

     

       196
       196
       +
                 machine.fail(f"{sysu} is-active xss-lock")

     

       197
       197
       +
           '';

     

       198
       198
       +
         };

     

       199
       199
       +
       

     

       108
       200
        
       }