diff options
author | Vladimír Čunát <v@cunat.cz> | 2022-10-17 09:09:53 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2022-10-17 09:09:53 +0200 |
commit | 8b880dd5d15d9ea02a7353fda25b69f25003da3d (patch) | |
tree | a88e712abb2195e2b40b415cc7517cf8effc2836 /nixos/tests | |
parent | 2dcf66549d8b388d788e94e46a654d60cdf98824 (diff) | |
parent | 8a45db4fb92fd71f1b7a6d49a9e478f725209e48 (diff) |
Merge #195505: nixosTests: avoid some broken ones, fix some others
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/cloud-init.nix | 1 | ||||
-rw-r--r-- | nixos/tests/custom-ca.nix | 2 | ||||
-rw-r--r-- | nixos/tests/domination.nix | 2 | ||||
-rw-r--r-- | nixos/tests/matrix/mjolnir.nix | 1 | ||||
-rw-r--r-- | nixos/tests/systemd-cryptenroll.nix | 1 | ||||
-rw-r--r-- | nixos/tests/terminal-emulators.nix | 8 | ||||
-rw-r--r-- | nixos/tests/wine.nix | 5 |
7 files changed, 14 insertions, 6 deletions
diff --git a/nixos/tests/cloud-init.nix b/nixos/tests/cloud-init.nix index 9feb8d5c1526e..a86cd569e4215 100644 --- a/nixos/tests/cloud-init.nix +++ b/nixos/tests/cloud-init.nix @@ -60,6 +60,7 @@ in makeTest { name = "cloud-init"; meta = with pkgs.lib.maintainers; { maintainers = [ lewo ]; + broken = true; # almost always times out after spending many hours }; nodes.machine = { ... }: { diff --git a/nixos/tests/custom-ca.nix b/nixos/tests/custom-ca.nix index 73e47c3c9d0d6..25a7b6fdea46e 100644 --- a/nixos/tests/custom-ca.nix +++ b/nixos/tests/custom-ca.nix @@ -191,5 +191,5 @@ in firefox = { error = "Security Risk"; }; chromium = { error = "not private"; }; qutebrowser = { args = "-T"; error = "Certificate error"; }; - midori = { error = "Security"; }; + midori = { args = "-p"; error = "Security"; }; } diff --git a/nixos/tests/domination.nix b/nixos/tests/domination.nix index 09027740ab8de..409a7f3029c42 100644 --- a/nixos/tests/domination.nix +++ b/nixos/tests/domination.nix @@ -20,7 +20,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { machine.wait_for_x() machine.execute("domination >&2 &") machine.wait_for_window("Menu") - machine.wait_for_text("New Game") + machine.wait_for_text(r"(New Game|Start Server|Load Game|Help Manual|Join Game|About|Play Online)") machine.screenshot("screen") ''; }) diff --git a/nixos/tests/matrix/mjolnir.nix b/nixos/tests/matrix/mjolnir.nix index cb843e2e9e3e8..b1ac55d951cef 100644 --- a/nixos/tests/matrix/mjolnir.nix +++ b/nixos/tests/matrix/mjolnir.nix @@ -32,6 +32,7 @@ import ../make-test-python.nix ( name = "mjolnir"; meta = with pkgs.lib; { maintainers = teams.matrix.members; + broken = true; # times out after spending many hours }; nodes = { diff --git a/nixos/tests/systemd-cryptenroll.nix b/nixos/tests/systemd-cryptenroll.nix index 055ae7d1681f2..9ee2d280fbbea 100644 --- a/nixos/tests/systemd-cryptenroll.nix +++ b/nixos/tests/systemd-cryptenroll.nix @@ -2,6 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { name = "systemd-cryptenroll"; meta = with pkgs.lib.maintainers; { maintainers = [ ymatsiuk ]; + broken = true; # times out after two hours, details -> https://github.com/NixOS/nixpkgs/issues/167994 }; nodes.machine = { pkgs, lib, ... }: { diff --git a/nixos/tests/terminal-emulators.nix b/nixos/tests/terminal-emulators.nix index c724608b91554..4269d05056d8c 100644 --- a/nixos/tests/terminal-emulators.nix +++ b/nixos/tests/terminal-emulators.nix @@ -23,8 +23,9 @@ with pkgs.lib; let tests = { alacritty.pkg = p: p.alacritty; - contour.pkg = p: p.contour; - contour.cmd = "contour $command"; + # times out after spending many hours + #contour.pkg = p: p.contour; + #contour.cmd = "contour $command"; cool-retro-term.pkg = p: p.cool-retro-term; cool-retro-term.colourTest = false; # broken by gloss effect @@ -103,7 +104,8 @@ let tests = { wayst.pkg = p: p.wayst; wayst.pinkValue = "#FF0066"; - wezterm.pkg = p: p.wezterm; + # times out after spending many hours + #wezterm.pkg = p: p.wezterm; xfce4-terminal.pkg = p: p.xfce.xfce4-terminal; diff --git a/nixos/tests/wine.nix b/nixos/tests/wine.nix index 8a64c3179c518..7cbe7ac94f1e7 100644 --- a/nixos/tests/wine.nix +++ b/nixos/tests/wine.nix @@ -44,5 +44,8 @@ in listToAttrs ( map (makeWineTest "winePackages" [ hello32 ]) variants ++ optionals pkgs.stdenv.is64bit - (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) variants) + (map (makeWineTest "wineWowPackages" [ hello32 hello64 ]) + # This wayland combination times out after spending many hours. + # https://hydra.nixos.org/job/nixos/trunk-combined/nixos.tests.wine.wineWowPackages-wayland.x86_64-linux + (pkgs.lib.remove "wayland" variants)) ) |