diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-26 18:52:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-11-26 18:52:34 +0100 |
| commit | e8baaba044689b75ef4f36ebc5a93b7462c23cb2 (patch) | |
| tree | 724d7b51c4eea2ae29995d677fe36103422e7aaa /nixos | |
| parent | 953f12995be933fb2c1efe314299556e4178e26e (diff) | |
| download | nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar.gz nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar.bz2 nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar.lz nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar.xz nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.tar.zst nixlib-e8baaba044689b75ef4f36ebc5a93b7462c23cb2.zip | |
Add a regression test for hostname / nss_myhostname
Issue #1248.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/build-vms.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/misc.nix | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index d20fbc1cc663..498c0a377836 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -68,8 +68,8 @@ rec { # the first interface (i.e. the first network in its # virtualisation.vlans option). networking.extraHosts = flip concatMapStrings machines - (m: let config = (getAttr m nodes).config; in - optionalString (config.networking.primaryIPAddress != "") + (m': let config = (getAttr m' nodes).config; in + optionalString (m.first != m' && config.networking.primaryIPAddress != "") ("${config.networking.primaryIPAddress} " + "${config.networking.hostName}\n")); diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 12ac6f6f9a67..d355d705a24c 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -59,6 +59,12 @@ subtest "override-env-var", sub { $machine->succeed('[ "$EDITOR" = emacs ]'); }; + + # Test whether hostname (and by extension nss_myhostname) works. + subtest "hostname", sub { + $machine->succeed('[ "`hostname`" = machine ]'); + $machine->succeed('[ "`hostname -s`" = machine ]'); + }; ''; } |