Unverified Commit 68995c09 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

nixosTests.avahi: migrate to runTest 

Part Of #386873
parent b1d55f03

nixos/tests/all-tests.nix

+8 −2
Original line number Diff line number Diff line
@@ -187,8 +187,14 @@ in { 
  authelia = runTest ./authelia.nix;

  auto-cpufreq = runTest ./auto-cpufreq.nix;

  autobrr = runTest ./autobrr.nix;

  avahi = handleTest ./avahi.nix {};

  avahi-with-resolved = handleTest ./avahi.nix { networkd = true; };

  avahi = runTest {

    imports = [ ./avahi.nix ];

    _module.args.networkd = false;

  };

  avahi-with-resolved = runTest {

    imports = [ ./avahi.nix ];

    _module.args.networkd = true;

  };

  ayatana-indicators = runTest ./ayatana-indicators.nix;

  babeld = runTest ./babeld.nix;

  bazarr = handleTest ./bazarr.nix {};

nixos/tests/avahi.nix

+7 −10
Original line number Diff line number Diff line 
{

  system ? builtins.currentSystem,

  config ? { },

  pkgs ? import ../.. { inherit system config; },

  pkgs,

  # 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.lib.maintainers; {

    maintainers = [ ];

  };

  meta.maintainers = [ ];



  nodes =

    let
@@ -29,7 +26,7 @@ import ./make-test-python.nix { 
            extraServiceFiles.ssh = "${pkgs.avahi}/etc/avahi/services/ssh.service";

          };

        }

        // pkgs.lib.optionalAttrs (networkd) {

        // pkgs.lib.optionalAttrs networkd {

          networking = {

            useNetworkd = true;

            useDHCP = false;
@@ -84,4 +81,4 @@ import ./make-test-python.nix { 


    one.log(one.execute("systemd-analyze security avahi-daemon.service | grep -v ✓")[1])

  '';

} args
 
}