From adc1b38b85857630be32452a2cfd26f39946d497 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 29 Oct 2013 13:04:52 +0100 Subject: Add a priority level for overrides in VM tests Now that overriding fileSystems in qemu-vm.nix works again, it's important that the VM tests that add additional file systems use the same override priority. Instead of using the same magic constant everywhere, they can now use mkVMOverride. http://hydra.nixos.org/build/6695561 --- nixos/tests/check-filesystems.nix | 2 +- nixos/tests/nfs.nix | 2 +- nixos/tests/trac.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'nixos/tests') diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix index c1dae0ca621a..09401f9a3f44 100644 --- a/nixos/tests/check-filesystems.nix +++ b/nixos/tests/check-filesystems.nix @@ -40,7 +40,7 @@ rec { device = "share:/repos2"; fsType = "nfs"; }; - in pkgs.lib.mkOverride 50 [ + in pkgs.lib.mkVMOverride [ repos1 repos1 # check remount repos2 # check after remount diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix index ee65c298dd00..51abf57e1b75 100644 --- a/nixos/tests/nfs.nix +++ b/nixos/tests/nfs.nix @@ -6,7 +6,7 @@ let client = { config, pkgs, ... }: - { fileSystems = pkgs.lib.mkOverride 50 + { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/data"; device = "server:${if version == 4 then "/" else "/data"}"; fsType = "nfs"; diff --git a/nixos/tests/trac.nix b/nixos/tests/trac.nix index 72442c885ace..e0d256f57019 100644 --- a/nixos/tests/trac.nix +++ b/nixos/tests/trac.nix @@ -27,7 +27,7 @@ webserver = { config, pkgs, ... }: - { fileSystems = pkgs.lib.mkOverride 50 + { fileSystems = pkgs.lib.mkVMOverride [ { mountPoint = "/repos"; device = "storage:/repos"; fsType = "nfs"; -- cgit 1.4.1