summary refs log tree commit diff
path: root/nixos/tests/avahi.nix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2020-10-11 20:45:25 +0200
committerFlorian Klink <flokli@flokli.de>2020-10-11 20:46:21 +0200
commita61ca0373b63225e3aa00556c8fc1fb36abcbe3e (patch)
tree88818932e2c0a516200377bf79cc983af043f4d1 /nixos/tests/avahi.nix
parent8294af02845210169290240e6fd356f6b7ea3f11 (diff)
downloadnixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar.gz
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar.bz2
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar.lz
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar.xz
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.tar.zst
nixpkgs-a61ca0373b63225e3aa00556c8fc1fb36abcbe3e.zip
nixosTests.avahi: add avahi-with-resolved
This allows testing avahi works with resolved being enabled, as a
regression test for https://github.com/NixOS/nixpkgs/pull/99530.
Diffstat (limited to 'nixos/tests/avahi.nix')
-rw-r--r--nixos/tests/avahi.nix13
1 files changed, 12 insertions, 1 deletions
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index fe027c14d5a..66cff3009f7 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -1,5 +1,11 @@
+{ system ? builtins.currentSystem
+, config ? {}
+, pkgs ? import ../.. { inherit system config; }
+# bool: whether to use networkd in the tests
+, networkd ? false }:
+
 # Test whether `avahi-daemon' and `libnss-mdns' work as expected.
-import ./make-test-python.nix ({ pkgs, ... } : {
+import ./make-test-python.nix ({ ... } : {
   name = "avahi";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ eelco ];
@@ -17,6 +23,11 @@ import ./make-test-python.nix ({ pkgs, ... } : {
         publish.workstation = true;
         extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";
       };
+    } // pkgs.lib.optionalAttrs (networkd) {
+      networking = {
+        useNetworkd = true;
+        useDHCP = false;
+      };
     };
   in {
     one = cfg;