From 68995c09692523ee5b3bac3ce88896b87a6df1a2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 13 Mar 2025 23:57:19 +0100
Subject: [PATCH] nixosTests.avahi: migrate to runTest

Part Of #386873
---
 nixos/tests/all-tests.nix | 10 ++++++++--
 nixos/tests/avahi.nix     | 17 +++++++----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f865782bf9c..65c02c1d9405 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -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 {};
diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index 7d9432396a28..77cb1d5332cb 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -1,17 +1,14 @@
 {
-  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
+}