diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 13:04:52 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-10-29 13:14:30 +0100 |
| commit | adc1b38b85857630be32452a2cfd26f39946d497 (patch) | |
| tree | 121f78854e3f9a8e2bc85065867c8b04e511ea03 /nixos/tests | |
| parent | f0b7b0af12be7b36add358cd1e24bbca02e57c64 (diff) | |
| download | nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.gz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.bz2 nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.lz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.xz nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.tar.zst nixpkgs-adc1b38b85857630be32452a2cfd26f39946d497.zip | |
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
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/check-filesystems.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/nfs.nix | 2 | ||||
| -rw-r--r-- | nixos/tests/trac.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/tests/check-filesystems.nix b/nixos/tests/check-filesystems.nix index c1dae0ca621..09401f9a3f4 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 ee65c298dd0..51abf57e1b7 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 72442c885ac..e0d256f5701 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"; |