git.iko.soy/typeable/nixpkgs
on master help sign in
nixos/tests/avahi: Fix evaluation

In commit a61ca0373b63225e3aa00556c8fc1fb36abcbe3e (#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

commit8ea168db1f0e0f04a613b9f46e5087f8d15654f0 authoraszlig <aszlig@nix.build> dateTue 20 Oct 2020, 17:33 (6 years ago) parentc4237e2
1 file changed+4−3
nixos/tests/avahi.nix+4−3
nixos/tests/avahi.nix+4−3
@@ -2,10 +2,11 @@
22, config ? {}
33, pkgs ? import ../.. { inherit system config; }
44# bool: whether to use networkd in the tests
5−, networkd ? false }:
5+, networkd ? false
6+} @ args:
67
78# Test whether `avahi-daemon' and `libnss-mdns' work as expected.
8−import ./make-test-python.nix ({ ... } : {
9+import ./make-test-python.nix {
910 name = "avahi";
1011 meta = with pkgs.stdenv.lib.maintainers; {
1112 maintainers = [ eelco ];
@@ -75,4 +76,4 @@ import ./make-test-python.nix ({ ... } : {
7576 two.succeed("avahi-browse -r -t _ssh._tcp | tee out >&2")
7677 two.succeed("test `wc -l < out` -gt 0")
7778 '';
78−})
79+} args