commit de76a1e8524a2ace49db66776fdfae16bcf80108 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       706
       706
        
         miniflux = handleTest ./miniflux.nix {};

     

       707
       707
        
         minio = handleTest ./minio.nix {};

     

       708
       708
        
         miracle-wm = runTest ./miracle-wm.nix;

     

       709
       709
       -
         miriway = handleTest ./miriway.nix {};

     

       709
       709
       +
         miriway = runTest ./miriway.nix;

     

       710
       710
        
         misc = handleTest ./misc.nix {};

     

       711
       711
        
         misskey = handleTest ./misskey.nix {};

     

       712
       712
        
         mjolnir = handleTest ./matrix/mjolnir.nix {};

+114 -116

nixos/tests/miriway.nix

···

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

     

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

     

       3
       3
       -
         {

     

       4
       4
       -
           name = "miriway";

     

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

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "miriway";

     

       5
       4
        
       

     

       6
       6
       -
           meta = {

     

       7
       7
       -
             maintainers = with lib.maintainers; [ OPNA2608 ];

     

       8
       8
       -
           };

     

       5
       5
       +
         meta = {

     

       6
       6
       +
           maintainers = with lib.maintainers; [ OPNA2608 ];

     

       7
       7
       +
         };

     

       9
       8
        
       

     

       10
       10
       -
           nodes.machine =

     

       11
       11
       -
             { config, ... }:

     

       12
       12
       -
             {

     

       13
       13
       -
               imports = [

     

       14
       14
       -
                 ./common/auto.nix

     

       15
       15
       -
                 ./common/user-account.nix

     

       16
       16
       -
               ];

     

       9
       9
       +
         nodes.machine =

     

       10
       10
       +
           { config, ... }:

     

       11
       11
       +
           {

     

       12
       12
       +
             imports = [

     

       13
       13
       +
               ./common/auto.nix

     

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

     

       15
       15
       +
             ];

     

       17
       16
        
       

     

       18
       18
       -
               # Seems to very rarely get interrupted by oom-killer

     

       19
       19
       -
               virtualisation.memorySize = 2047;

     

       17
       17
       +
             # Seems to very rarely get interrupted by oom-killer

     

       18
       18
       +
             virtualisation.memorySize = 2047;

     

       20
       19
        
       

     

       21
       21
       -
               test-support.displayManager.auto = {

     

       22
       22
       -
                 enable = true;

     

       23
       23
       -
                 user = "alice";

     

       24
       24
       -
               };

     

       20
       20
       +
             test-support.displayManager.auto = {

     

       21
       21
       +
               enable = true;

     

       22
       22
       +
               user = "alice";

     

       23
       23
       +
             };

     

       24
       24
       +
       

     

       25
       25
       +
             programs.ydotool.enable = true;

     

       25
       26
        
       

     

       26
       26
       -
               programs.ydotool.enable = true;

     

       27
       27
       +
             services.xserver.enable = true;

     

       28
       28
       +
             services.displayManager.defaultSession = lib.mkForce "miriway";

     

       27
       29
        
       

     

       28
       28
       -
               services.xserver.enable = true;

     

       29
       29
       -
               services.displayManager.defaultSession = lib.mkForce "miriway";

     

       30
       30
       +
             programs.miriway = {

     

       31
       31
       +
               enable = true;

     

       32
       32
       +
               config = ''

     

       33
       33
       +
                 add-wayland-extensions=all

     

       34
       34
       +
                 enable-x11=

     

       30
       35
        
       

     

       31
       31
       -
               programs.miriway = {

     

       32
       32
       -
                 enable = true;

     

       33
       33
       -
                 config = ''

     

       34
       34
       -
                   add-wayland-extensions=all

     

       35
       35
       -
                   enable-x11=

     

       36
       36
       +
                 ctrl-alt=t:foot --maximized

     

       37
       37
       +
                 ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\"

     

       36
       38
        
       

     

       37
       37
       -
                   ctrl-alt=t:foot --maximized

     

       38
       38
       -
                   ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\"

     

       39
       39
       +
                 shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY

     

       39
       40
        
       

     

       40
       40
       -
                   shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY

     

       41
       41
       +
                 shell-component=foot --maximized

     

       42
       42
       +
               '';

     

       43
       43
       +
             };

     

       41
       44
        
       

     

       42
       42
       -
                   shell-component=foot --maximized

     

       43
       43
       -
                 '';

     

       45
       45
       +
             environment = {

     

       46
       46
       +
               shellAliases = {

     

       47
       47
       +
                 test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";

     

       48
       48
       +
                 test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";

     

       44
       49
        
               };

     

       45
       50
        
       

     

       46
       46
       -
               environment = {

     

       47
       47
       -
                 shellAliases = {

     

       48
       48
       -
                   test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";

     

       49
       49
       -
                   test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";

     

       51
       51
       +
               systemPackages = with pkgs; [

     

       52
       52
       +
                 mesa-demos

     

       53
       53
       +
                 wayland-utils

     

       54
       54
       +
                 foot

     

       55
       55
       +
                 alacritty

     

       56
       56
       +
               ];

     

       57
       57
       +
       

     

       58
       58
       +
               # To help with OCR

     

       59
       59
       +
               etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {

     

       60
       60
       +
                 main = {

     

       61
       61
       +
                   font = "inconsolata:size=16";

     

       50
       62
        
                 };

     

       51
       51
       -
       

     

       52
       52
       -
                 systemPackages = with pkgs; [

     

       53
       53
       -
                   mesa-demos

     

       54
       54
       -
                   wayland-utils

     

       55
       55
       -
                   foot

     

       56
       56
       -
                   alacritty

     

       57
       57
       -
                 ];

     

       58
       58
       -
       

     

       59
       59
       -
                 # To help with OCR

     

       60
       60
       -
                 etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {

     

       61
       61
       -
                   main = {

     

       62
       62
       -
                     font = "inconsolata:size=16";

     

       63
       63
       -
                   };

     

       64
       64
       -
                   colors = rec {

     

       65
       65
       -
                     foreground = "000000";

     

       66
       66
       -
                     background = "ffffff";

     

       67
       67
       -
                     regular2 = foreground;

     

       68
       68
       -
                   };

     

       63
       63
       +
                 colors = rec {

     

       64
       64
       +
                   foreground = "000000";

     

       65
       65
       +
                   background = "ffffff";

     

       66
       66
       +
                   regular2 = foreground;

     

       69
       67
        
                 };

     

       70
       70
       -
                 etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {

     

       71
       71
       -
                   font = rec {

     

       72
       72
       -
                     normal.family = "Inconsolata";

     

       73
       73
       -
                     bold.family = normal.family;

     

       74
       74
       -
                     italic.family = normal.family;

     

       75
       75
       -
                     bold_italic.family = normal.family;

     

       76
       76
       -
                     size = 16;

     

       68
       68
       +
               };

     

       69
       69
       +
               etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {

     

       70
       70
       +
                 font = rec {

     

       71
       71
       +
                   normal.family = "Inconsolata";

     

       72
       72
       +
                   bold.family = normal.family;

     

       73
       73
       +
                   italic.family = normal.family;

     

       74
       74
       +
                   bold_italic.family = normal.family;

     

       75
       75
       +
                   size = 16;

     

       76
       76
       +
                 };

     

       77
       77
       +
                 colors = rec {

     

       78
       78
       +
                   primary = {

     

       79
       79
       +
                     foreground = "0x000000";

     

       80
       80
       +
                     background = "0xffffff";

     

       77
       81
        
                   };

     

       78
       78
       -
                   colors = rec {

     

       79
       79
       -
                     primary = {

     

       80
       80
       -
                       foreground = "0x000000";

     

       81
       81
       -
                       background = "0xffffff";

     

       82
       82
       -
                     };

     

       83
       83
       -
                     normal = {

     

       84
       84
       -
                       green = primary.foreground;

     

       85
       85
       -
                     };

     

       82
       82
       +
                   normal = {

     

       83
       83
       +
                     green = primary.foreground;

     

       86
       84
        
                   };

     

       87
       85
        
                 };

     

       88
       86
        
               };

     

       89
       89
       -
       

     

       90
       90
       -
               fonts.packages = [ pkgs.inconsolata ];

     

       91
       87
        
             };

     

       92
       88
        
       

     

       93
       93
       -
           enableOCR = true;

     

       89
       89
       +
             fonts.packages = [ pkgs.inconsolata ];

     

       90
       90
       +
           };

     

       94
       91
        
       

     

       95
       95
       -
           testScript =

     

       96
       96
       -
             { nodes, ... }:

     

       97
       97
       -
             ''

     

       98
       98
       -
               start_all()

     

       99
       99
       -
               machine.wait_for_unit("multi-user.target")

     

       92
       92
       +
         enableOCR = true;

     

       93
       93
       +
       

     

       94
       94
       +
         testScript =

     

       95
       95
       +
           { nodes, ... }:

     

       96
       96
       +
           ''

     

       97
       97
       +
             start_all()

     

       98
       98
       +
             machine.wait_for_unit("multi-user.target")

     

       100
       99
        
       

     

       101
       101
       -
               # Wait for Miriway to complete startup

     

       102
       102
       -
               machine.wait_for_file("/run/user/1000/wayland-0")

     

       103
       103
       -
               machine.succeed("pgrep miriway-shell")

     

       104
       104
       -
               machine.screenshot("miriway_launched")

     

       100
       100
       +
             # Wait for Miriway to complete startup

     

       101
       101
       +
             machine.wait_for_file("/run/user/1000/wayland-0")

     

       102
       102
       +
             machine.succeed("pgrep miriway-shell")

     

       103
       103
       +
             machine.screenshot("miriway_launched")

     

       105
       104
        
       

     

       106
       106
       -
               # Test Wayland

     

       107
       107
       -
               # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind

     

       108
       108
       -
               # machine.send_key("ctrl-alt-t")

     

       109
       109
       -
               machine.wait_for_text(r"(alice|machine)")

     

       110
       110
       -
               machine.send_chars("test-wayland\n")

     

       111
       111
       -
               machine.wait_for_file("/tmp/test-wayland-exit-ok")

     

       112
       112
       -
               machine.copy_from_vm("/tmp/test-wayland.out")

     

       113
       113
       -
               machine.screenshot("foot_wayland_info")

     

       105
       105
       +
             # Test Wayland

     

       106
       106
       +
             # We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind

     

       107
       107
       +
             # machine.send_key("ctrl-alt-t")

     

       108
       108
       +
             machine.wait_for_text(r"(alice|machine)")

     

       109
       109
       +
             machine.send_chars("test-wayland\n")

     

       110
       110
       +
             machine.wait_for_file("/tmp/test-wayland-exit-ok")

     

       111
       111
       +
             machine.copy_from_vm("/tmp/test-wayland.out")

     

       112
       112
       +
             machine.screenshot("foot_wayland_info")

     

       114
       113
        
       

     

       115
       115
       -
               # please actually register that we want to close the window

     

       116
       116
       -
               machine.succeed("ydotool mousemove -- 10 10")

     

       117
       117
       -
               machine.sleep(3)

     

       114
       114
       +
             # please actually register that we want to close the window

     

       115
       115
       +
             machine.succeed("ydotool mousemove -- 10 10")

     

       116
       116
       +
             machine.sleep(3)

     

       118
       117
        
       

     

       119
       119
       -
               machine.send_chars("exit\n")

     

       118
       118
       +
             machine.send_chars("exit\n")

     

       120
       119
        
       

     

       121
       121
       -
               # please actually register that we want to close the window

     

       122
       122
       -
               machine.succeed("ydotool mousemove -- 10 10")

     

       123
       123
       -
               machine.sleep(3)

     

       120
       120
       +
             # please actually register that we want to close the window

     

       121
       121
       +
             machine.succeed("ydotool mousemove -- 10 10")

     

       122
       122
       +
             machine.sleep(3)

     

       124
       123
        
       

     

       125
       125
       -
               machine.wait_until_fails("pgrep foot")

     

       124
       124
       +
             machine.wait_until_fails("pgrep foot")

     

       126
       125
        
       

     

       127
       127
       -
               # Test XWayland

     

       128
       128
       -
               machine.send_key("ctrl-alt-a")

     

       129
       129
       -
               machine.wait_for_text(r"(alice|machine)")

     

       130
       130
       -
               machine.send_chars("test-x11\n")

     

       131
       131
       -
               machine.wait_for_file("/tmp/test-x11-exit-ok")

     

       132
       132
       -
               machine.copy_from_vm("/tmp/test-x11.out")

     

       133
       133
       -
               machine.screenshot("alacritty_glinfo")

     

       126
       126
       +
             # Test XWayland

     

       127
       127
       +
             machine.send_key("ctrl-alt-a")

     

       128
       128
       +
             machine.wait_for_text(r"(alice|machine)")

     

       129
       129
       +
             machine.send_chars("test-x11\n")

     

       130
       130
       +
             machine.wait_for_file("/tmp/test-x11-exit-ok")

     

       131
       131
       +
             machine.copy_from_vm("/tmp/test-x11.out")

     

       132
       132
       +
             machine.screenshot("alacritty_glinfo")

     

       134
       133
        
       

     

       135
       135
       -
               # please actually register that we want to close the window

     

       136
       136
       -
               machine.succeed("ydotool mousemove -- 10 10")

     

       137
       137
       -
               machine.sleep(3)

     

       134
       134
       +
             # please actually register that we want to close the window

     

       135
       135
       +
             machine.succeed("ydotool mousemove -- 10 10")

     

       136
       136
       +
             machine.sleep(3)

     

       138
       137
        
       

     

       139
       139
       -
               machine.send_chars("exit\n")

     

       138
       138
       +
             machine.send_chars("exit\n")

     

       140
       139
        
       

     

       141
       141
       -
               # please actually register that we want to close the window

     

       142
       142
       -
               machine.succeed("ydotool mousemove -- 10 10")

     

       143
       143
       -
               machine.sleep(3)

     

       140
       140
       +
             # please actually register that we want to close the window

     

       141
       141
       +
             machine.succeed("ydotool mousemove -- 10 10")

     

       142
       142
       +
             machine.sleep(3)

     

       144
       143
        
       

     

       145
       145
       -
               machine.wait_until_fails("pgrep alacritty")

     

       146
       146
       -
             '';

     

       147
       147
       -
         }

     

       148
       148
       -
       )

     

       144
       144
       +
             machine.wait_until_fails("pgrep alacritty")

     

       145
       145
       +
           '';

     

       146
       146
       +
       }