mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 13:41:26 +00:00
8ea168db1f
In commit a61ca0373b (#100267), the avahi
test expression got an additional attribute, but instead of wrapping the
function, the attributes were introduced by nesting the function one
level deeper.
To illustrate this:
Before: attrs: <testdrv>
After: newattrs: attrs: <testdrv>
So when instantiating tests.avahi.x86_64-linux from nixos/release.nix we
get "value is a function while a set was expected" instead of the
derivation.
I simply re-passed the attributes to make-test-python.nix, since the
function already allows (via "...") arbitrary attributes to be passed.
The reason why I'm pushing this directly to master is because evaluation
for the test is already broken and the worst that could happen here is
that things are *still* broken.
Signed-off-by: aszlig <aszlig@nix.build>
Cc: @flokli, @doronbehar
80 lines
2.4 KiB
Nix
80 lines
2.4 KiB
Nix
{ system ? builtins.currentSystem
|
|
, config ? {}
|
|
, pkgs ? import ../.. { inherit system config; }
|
|
# bool: whether to use networkd in the tests
|
|
, networkd ? false
|
|
} @ args:
|
|
|
|
# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
|
|
import ./make-test-python.nix {
|
|
name = "avahi";
|
|
meta = with pkgs.stdenv.lib.maintainers; {
|
|
maintainers = [ eelco ];
|
|
};
|
|
|
|
nodes = let
|
|
cfg = { ... }: {
|
|
services.avahi = {
|
|
enable = true;
|
|
nssmdns = true;
|
|
publish.addresses = true;
|
|
publish.domain = true;
|
|
publish.enable = true;
|
|
publish.userServices = true;
|
|
publish.workstation = true;
|
|
extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
|
|
};
|
|
} // pkgs.lib.optionalAttrs (networkd) {
|
|
networking = {
|
|
useNetworkd = true;
|
|
useDHCP = false;
|
|
};
|
|
};
|
|
in {
|
|
one = cfg;
|
|
two = cfg;
|
|
};
|
|
|
|
testScript = ''
|
|
start_all()
|
|
|
|
# mDNS.
|
|
one.wait_for_unit("network.target")
|
|
two.wait_for_unit("network.target")
|
|
|
|
one.succeed("avahi-resolve-host-name one.local | tee out >&2")
|
|
one.succeed('test "`cut -f1 < out`" = one.local')
|
|
one.succeed("avahi-resolve-host-name two.local | tee out >&2")
|
|
one.succeed('test "`cut -f1 < out`" = two.local')
|
|
|
|
two.succeed("avahi-resolve-host-name one.local | tee out >&2")
|
|
two.succeed('test "`cut -f1 < out`" = one.local')
|
|
two.succeed("avahi-resolve-host-name two.local | tee out >&2")
|
|
two.succeed('test "`cut -f1 < out`" = two.local')
|
|
|
|
# Basic DNS-SD.
|
|
one.succeed("avahi-browse -r -t _workstation._tcp | tee out >&2")
|
|
one.succeed("test `wc -l < out` -gt 0")
|
|
two.succeed("avahi-browse -r -t _workstation._tcp | tee out >&2")
|
|
two.succeed("test `wc -l < out` -gt 0")
|
|
|
|
# More DNS-SD.
|
|
one.execute('avahi-publish -s "This is a test" _test._tcp 123 one=1 &')
|
|
one.sleep(5)
|
|
two.succeed("avahi-browse -r -t _test._tcp | tee out >&2")
|
|
two.succeed("test `wc -l < out` -gt 0")
|
|
|
|
# NSS-mDNS.
|
|
one.succeed("getent hosts one.local >&2")
|
|
one.succeed("getent hosts two.local >&2")
|
|
two.succeed("getent hosts one.local >&2")
|
|
two.succeed("getent hosts two.local >&2")
|
|
|
|
# extra service definitions
|
|
one.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
|
|
one.succeed("test `wc -l < out` -gt 0")
|
|
two.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
|
|
two.succeed("test `wc -l < out` -gt 0")
|
|
'';
|
|
} args
|