summaryrefslogtreecommitdiffstats
path: root/nixos/tests/installed-tests
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-07-26 13:56:16 +0200
committerGitHub <noreply@github.com>2020-07-26 13:56:16 +0200
commita86f4110a769227c1c8bf7e88264c583bfdfd688 (patch)
tree05693b1383319791b57fdce3c328a90d28dbfa91 /nixos/tests/installed-tests
parent5d3f240ebda4bb1591cd29cf7669b75a20dc0dc4 (diff)
parent379038b4dc818c89c931a4ce6cfc14c56fc811ec (diff)
Merge pull request #93771 from jtojnar/flatpak-1.8
Diffstat (limited to 'nixos/tests/installed-tests')
-rw-r--r--nixos/tests/installed-tests/default.nix6
-rw-r--r--nixos/tests/installed-tests/flatpak.nix9
2 files changed, 9 insertions, 6 deletions
diff --git a/nixos/tests/installed-tests/default.nix b/nixos/tests/installed-tests/default.nix
index b6bdfea22770..889a00d4b568 100644
--- a/nixos/tests/installed-tests/default.nix
+++ b/nixos/tests/installed-tests/default.nix
@@ -50,6 +50,12 @@ let
environment.systemPackages = with pkgs; [ gnome-desktop-testing ];
+ # The installed tests need to be added to the test VM’s closure.
+ # Otherwise, their dependencies might not actually be registered
+ # as valid paths in the VM’s Nix store database,
+ # and `nix-store --query` commands run as part of the tests
+ # (for example when building Flatpak runtimes) will fail.
+ environment.variables.TESTED_PACKAGE_INSTALLED_TESTS = "${tested.installedTests}/share";
};
testScript =
diff --git a/nixos/tests/installed-tests/flatpak.nix b/nixos/tests/installed-tests/flatpak.nix
index 091c99326629..8aeeaca90f61 100644
--- a/nixos/tests/installed-tests/flatpak.nix
+++ b/nixos/tests/installed-tests/flatpak.nix
@@ -5,14 +5,11 @@ makeInstalledTest {
withX11 = true;
testConfig = {
- services.xserver.desktopManager.gnome3.enable = true; # TODO: figure out minimal environment where the tests work
- # common/x11.nix enables the auto display manager (lightdm)
- services.xserver.displayManager.gdm.enable = false;
- services.gnome3.core-utilities.enable = false;
+ xdg.portal.enable = true;
services.flatpak.enable = true;
- environment.systemPackages = with pkgs; [ gnupg ostree python2 ];
+ environment.systemPackages = with pkgs; [ gnupg ostree python3 ];
virtualisation.memorySize = 2047;
- virtualisation.diskSize = 1024;
+ virtualisation.diskSize = 3072;
};
testRunnerFlags = "--timeout 3600";