diff options
author | Artturin <Artturin@artturin.com> | 2022-10-03 16:56:51 +0300 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2022-10-10 15:30:59 +0300 |
commit | f4ea1208ec732d423a784bbb2b882f997b6af902 (patch) | |
tree | cadc358926dfd142fb2c1ebf0dce6317b48474dc /nixos/tests/installed-tests | |
parent | 8d32772702a4ebdf15c77e2e927787ae360a6bf6 (diff) |
treewide: *Flags convert to list from str
*Flags implies a list slightly relevant: > stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172 the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so it's not a breaking change
Diffstat (limited to 'nixos/tests/installed-tests')
-rw-r--r-- | nixos/tests/installed-tests/default.nix | 4 | ||||
-rw-r--r-- | nixos/tests/installed-tests/flatpak-builder.nix | 2 | ||||
-rw-r--r-- | nixos/tests/installed-tests/flatpak.nix | 2 | ||||
-rw-r--r-- | nixos/tests/installed-tests/gdk-pixbuf.nix | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix index b2c1b43f90ee9..2eaa980052093 100644 --- a/nixos/tests/installed-tests/default.nix +++ b/nixos/tests/installed-tests/default.nix @@ -28,7 +28,7 @@ let , withX11 ? false # Extra flags to pass to gnome-desktop-testing-runner. - , testRunnerFlags ? "" + , testRunnerFlags ? [] # Extra attributes to pass to makeTest. # They will be recursively merged into the attrset created by this function. @@ -67,7 +67,7 @@ let '' + '' machine.succeed( - "gnome-desktop-testing-runner ${testRunnerFlags} -d '${tested.installedTests}/share'" + "gnome-desktop-testing-runner ${escapeShellArgs testRunnerFlags} -d '${tested.installedTests}/share'" ) ''; } diff --git a/nixos/tests/installed-tests/flatpak-builder.nix b/nixos/tests/installed-tests/flatpak-builder.nix index 41f4060fb69e5..d5e04fcf975ce 100644 --- a/nixos/tests/installed-tests/flatpak-builder.nix +++ b/nixos/tests/installed-tests/flatpak-builder.nix @@ -11,5 +11,5 @@ makeInstalledTest { virtualisation.diskSize = 2048; }; - testRunnerFlags = "--timeout 3600"; + testRunnerFlags = [ "--timeout" "3600" ]; } diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix index c7fe9cf458822..9524d890c4025 100644 --- a/nixos/tests/installed-tests/flatpak.nix +++ b/nixos/tests/installed-tests/flatpak.nix @@ -13,5 +13,5 @@ makeInstalledTest { virtualisation.diskSize = 3072; }; - testRunnerFlags = "--timeout 3600"; + testRunnerFlags = [ "--timeout" "3600" ]; } diff --git a/nixos/tests/installed-tests/gdk-pixbuf.nix b/nixos/tests/installed-tests/gdk-pixbuf.nix index 3d0011a427a44..110efdbf710f2 100644 --- a/nixos/tests/installed-tests/gdk-pixbuf.nix +++ b/nixos/tests/installed-tests/gdk-pixbuf.nix @@ -9,5 +9,5 @@ makeInstalledTest { virtualisation.memorySize = if pkgs.stdenv.isi686 then 2047 else 4096; }; - testRunnerFlags = "--timeout 1800"; + testRunnerFlags = [ "--timeout" "1800" ]; } |