diff options
| author | Danylo Hlynskyi <abcz2.uprola@gmail.com> | 2020-02-17 21:03:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-17 21:03:40 +0200 |
| commit | 69efb5cd343a947502bf2372c0385e0afc84c570 (patch) | |
| tree | b5f2754d2cc03e0e52889e6849609081d8cec245 /nixos/tests | |
| parent | b92d2ce3a12ad0df2358aa2198f29e90faaaf0bc (diff) | |
| parent | d7bc3a753452faed3dac6ad9914dcdd0e4bee2f0 (diff) | |
| download | nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar.gz nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar.bz2 nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar.lz nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar.xz nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.tar.zst nixlib-69efb5cd343a947502bf2372c0385e0afc84c570.zip | |
Merge pull request #80346 from rnhmjoj/loaof
tests: fix more loaOf deprecation warnings
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/glusterfs.nix | 19 | ||||
| -rw-r--r-- | nixos/tests/nfs/simple.nix | 14 | ||||
| -rw-r--r-- | nixos/tests/orangefs.nix | 10 |
3 files changed, 22 insertions, 21 deletions
diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 8f9cb8973d51..cb07bc09511d 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -4,10 +4,11 @@ let client = { pkgs, ... } : { environment.systemPackages = [ pkgs.glusterfs ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/gluster"; - fsType = "glusterfs"; - device = "server1:/gv0"; - } ]; + { "/gluster" = + { device = "server1:/gv0"; + fsType = "glusterfs"; + }; + }; }; server = { pkgs, ... } : { @@ -22,11 +23,11 @@ let virtualisation.emptyDiskImages = [ 1024 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; }; in { name = "glusterfs"; diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index a1a09ee0f45c..c49ebddc2fdd 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -5,13 +5,13 @@ let client = { pkgs, ... }: { fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - # nfs4 exports the export with fsid=0 as a virtual root directory - device = if (version == 4) then "server:/" else "server:/data"; - fsType = "nfs"; - options = [ "vers=${toString version}" ]; - } - ]; + { "/data" = + { # nfs4 exports the export with fsid=0 as a virtual root directory + device = if (version == 4) then "server:/" else "server:/data"; + fsType = "nfs"; + options = [ "vers=${toString version}" ]; + }; + }; networking.firewall.enable = false; # FIXME: only open statd }; diff --git a/nixos/tests/orangefs.nix b/nixos/tests/orangefs.nix index 46d7a6a72f89..24b7737058c8 100644 --- a/nixos/tests/orangefs.nix +++ b/nixos/tests/orangefs.nix @@ -10,11 +10,11 @@ let virtualisation.emptyDiskImages = [ 4096 ]; fileSystems = pkgs.lib.mkVMOverride - [ { mountPoint = "/data"; - device = "/dev/disk/by-label/data"; - fsType = "ext4"; - } - ]; + { "/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + }; services.orangefs.server = { enable = true; |