mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-09 19:13:26 +03:00
nixosTests.miriway: Migrate to runTest
This commit is contained in:
OPNA2608
parent
59e6a84a7b
commit
de76a1e852
2 changed files with 129 additions and 131 deletions
|
|
@ -706,7 +706,7 @@ in {
|
|||
miniflux = handleTest ./miniflux.nix {};
|
||||
minio = handleTest ./minio.nix {};
|
||||
miracle-wm = runTest ./miracle-wm.nix;
|
||||
miriway = handleTest ./miriway.nix {};
|
||||
miriway = runTest ./miriway.nix;
|
||||
misc = handleTest ./misc.nix {};
|
||||
misskey = handleTest ./misskey.nix {};
|
||||
mjolnir = handleTest ./matrix/mjolnir.nix {};
|
||||
|
|
|
|||
|
|
@ -1,148 +1,146 @@
|
|||
import ./make-test-python.nix (
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "miriway";
|
||||
{ pkgs, lib, ... }:
|
||||
{
|
||||
name = "miriway";
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
};
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ OPNA2608 ];
|
||||
};
|
||||
|
||||
nodes.machine =
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
./common/auto.nix
|
||||
./common/user-account.nix
|
||||
];
|
||||
nodes.machine =
|
||||
{ config, ... }:
|
||||
{
|
||||
imports = [
|
||||
./common/auto.nix
|
||||
./common/user-account.nix
|
||||
];
|
||||
|
||||
# Seems to very rarely get interrupted by oom-killer
|
||||
virtualisation.memorySize = 2047;
|
||||
# Seems to very rarely get interrupted by oom-killer
|
||||
virtualisation.memorySize = 2047;
|
||||
|
||||
test-support.displayManager.auto = {
|
||||
enable = true;
|
||||
user = "alice";
|
||||
};
|
||||
|
||||
programs.ydotool.enable = true;
|
||||
|
||||
services.xserver.enable = true;
|
||||
services.displayManager.defaultSession = lib.mkForce "miriway";
|
||||
|
||||
programs.miriway = {
|
||||
enable = true;
|
||||
config = ''
|
||||
add-wayland-extensions=all
|
||||
enable-x11=
|
||||
|
||||
ctrl-alt=t:foot --maximized
|
||||
ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\"
|
||||
|
||||
shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
|
||||
|
||||
shell-component=foot --maximized
|
||||
'';
|
||||
};
|
||||
|
||||
environment = {
|
||||
shellAliases = {
|
||||
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
|
||||
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
};
|
||||
|
||||
systemPackages = with pkgs; [
|
||||
mesa-demos
|
||||
wayland-utils
|
||||
foot
|
||||
alacritty
|
||||
];
|
||||
|
||||
# To help with OCR
|
||||
etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {
|
||||
main = {
|
||||
font = "inconsolata:size=16";
|
||||
};
|
||||
colors = rec {
|
||||
foreground = "000000";
|
||||
background = "ffffff";
|
||||
regular2 = foreground;
|
||||
};
|
||||
};
|
||||
etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {
|
||||
font = rec {
|
||||
normal.family = "Inconsolata";
|
||||
bold.family = normal.family;
|
||||
italic.family = normal.family;
|
||||
bold_italic.family = normal.family;
|
||||
size = 16;
|
||||
};
|
||||
colors = rec {
|
||||
primary = {
|
||||
foreground = "0x000000";
|
||||
background = "0xffffff";
|
||||
};
|
||||
normal = {
|
||||
green = primary.foreground;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
fonts.packages = [ pkgs.inconsolata ];
|
||||
test-support.displayManager.auto = {
|
||||
enable = true;
|
||||
user = "alice";
|
||||
};
|
||||
|
||||
enableOCR = true;
|
||||
programs.ydotool.enable = true;
|
||||
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
services.xserver.enable = true;
|
||||
services.displayManager.defaultSession = lib.mkForce "miriway";
|
||||
|
||||
# Wait for Miriway to complete startup
|
||||
machine.wait_for_file("/run/user/1000/wayland-0")
|
||||
machine.succeed("pgrep miriway-shell")
|
||||
machine.screenshot("miriway_launched")
|
||||
programs.miriway = {
|
||||
enable = true;
|
||||
config = ''
|
||||
add-wayland-extensions=all
|
||||
enable-x11=
|
||||
|
||||
# Test Wayland
|
||||
# We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind
|
||||
# machine.send_key("ctrl-alt-t")
|
||||
machine.wait_for_text(r"(alice|machine)")
|
||||
machine.send_chars("test-wayland\n")
|
||||
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
||||
machine.copy_from_vm("/tmp/test-wayland.out")
|
||||
machine.screenshot("foot_wayland_info")
|
||||
ctrl-alt=t:foot --maximized
|
||||
ctrl-alt=a:env WINIT_UNIX_BACKEND=x11 WAYLAND_DISPLAY= alacritty --option window.startup_mode=\"maximized\"
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY
|
||||
|
||||
machine.send_chars("exit\n")
|
||||
shell-component=foot --maximized
|
||||
'';
|
||||
};
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
environment = {
|
||||
shellAliases = {
|
||||
test-wayland = "wayland-info | tee /tmp/test-wayland.out && touch /tmp/test-wayland-exit-ok";
|
||||
test-x11 = "glinfo | tee /tmp/test-x11.out && touch /tmp/test-x11-exit-ok";
|
||||
};
|
||||
|
||||
machine.wait_until_fails("pgrep foot")
|
||||
systemPackages = with pkgs; [
|
||||
mesa-demos
|
||||
wayland-utils
|
||||
foot
|
||||
alacritty
|
||||
];
|
||||
|
||||
# Test XWayland
|
||||
machine.send_key("ctrl-alt-a")
|
||||
machine.wait_for_text(r"(alice|machine)")
|
||||
machine.send_chars("test-x11\n")
|
||||
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
||||
machine.copy_from_vm("/tmp/test-x11.out")
|
||||
machine.screenshot("alacritty_glinfo")
|
||||
# To help with OCR
|
||||
etc."xdg/foot/foot.ini".source = (pkgs.formats.ini { }).generate "foot.ini" {
|
||||
main = {
|
||||
font = "inconsolata:size=16";
|
||||
};
|
||||
colors = rec {
|
||||
foreground = "000000";
|
||||
background = "ffffff";
|
||||
regular2 = foreground;
|
||||
};
|
||||
};
|
||||
etc."xdg/alacritty/alacritty.toml".source = (pkgs.formats.toml { }).generate "alacritty.toml" {
|
||||
font = rec {
|
||||
normal.family = "Inconsolata";
|
||||
bold.family = normal.family;
|
||||
italic.family = normal.family;
|
||||
bold_italic.family = normal.family;
|
||||
size = 16;
|
||||
};
|
||||
colors = rec {
|
||||
primary = {
|
||||
foreground = "0x000000";
|
||||
background = "0xffffff";
|
||||
};
|
||||
normal = {
|
||||
green = primary.foreground;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
fonts.packages = [ pkgs.inconsolata ];
|
||||
};
|
||||
|
||||
machine.send_chars("exit\n")
|
||||
enableOCR = true;
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
testScript =
|
||||
{ nodes, ... }:
|
||||
''
|
||||
start_all()
|
||||
machine.wait_for_unit("multi-user.target")
|
||||
|
||||
machine.wait_until_fails("pgrep alacritty")
|
||||
'';
|
||||
}
|
||||
)
|
||||
# Wait for Miriway to complete startup
|
||||
machine.wait_for_file("/run/user/1000/wayland-0")
|
||||
machine.succeed("pgrep miriway-shell")
|
||||
machine.screenshot("miriway_launched")
|
||||
|
||||
# Test Wayland
|
||||
# We let Miriway start the first terminal, as we might get stuck if it's not ready to process the first keybind
|
||||
# machine.send_key("ctrl-alt-t")
|
||||
machine.wait_for_text(r"(alice|machine)")
|
||||
machine.send_chars("test-wayland\n")
|
||||
machine.wait_for_file("/tmp/test-wayland-exit-ok")
|
||||
machine.copy_from_vm("/tmp/test-wayland.out")
|
||||
machine.screenshot("foot_wayland_info")
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
|
||||
machine.send_chars("exit\n")
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
|
||||
machine.wait_until_fails("pgrep foot")
|
||||
|
||||
# Test XWayland
|
||||
machine.send_key("ctrl-alt-a")
|
||||
machine.wait_for_text(r"(alice|machine)")
|
||||
machine.send_chars("test-x11\n")
|
||||
machine.wait_for_file("/tmp/test-x11-exit-ok")
|
||||
machine.copy_from_vm("/tmp/test-x11.out")
|
||||
machine.screenshot("alacritty_glinfo")
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
|
||||
machine.send_chars("exit\n")
|
||||
|
||||
# please actually register that we want to close the window
|
||||
machine.succeed("ydotool mousemove -- 10 10")
|
||||
machine.sleep(3)
|
||||
|
||||
machine.wait_until_fails("pgrep alacritty")
|
||||
'';
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue