diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 99e80f0ec537..5bad50b737d0 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -1315,7 +1315,7 @@ in { _module.args.package = pkgs.zigbee2mqtt_2; }; zipline = handleTest ./zipline.nix {}; - zoneminder = handleTest ./zoneminder.nix {}; + zoneminder = runTest ./zoneminder.nix; zookeeper = runTest ./zookeeper.nix; zram-generator = runTest ./zram-generator.nix; zrepl = runTest ./zrepl.nix; diff --git a/nixos/tests/zoneminder.nix b/nixos/tests/zoneminder.nix index 7a32ff8bb8bb..da0484a6615b 100644 --- a/nixos/tests/zoneminder.nix +++ b/nixos/tests/zoneminder.nix @@ -1,26 +1,24 @@ -import ./make-test-python.nix ( - { lib, ... }: +{ lib, ... }: - { - name = "zoneminder"; - meta.maintainers = with lib.maintainers; [ danielfullmer ]; +{ + name = "zoneminder"; + meta.maintainers = with lib.maintainers; [ danielfullmer ]; - nodes.machine = - { ... }: - { - services.zoneminder = { - enable = true; - database.createLocally = true; - database.username = "zoneminder"; - }; - time.timeZone = "America/New_York"; + nodes.machine = + { ... }: + { + services.zoneminder = { + enable = true; + database.createLocally = true; + database.username = "zoneminder"; }; + time.timeZone = "America/New_York"; + }; - testScript = '' - machine.wait_for_unit("zoneminder.service") - machine.wait_for_unit("nginx.service") - machine.wait_for_open_port(8095) - machine.succeed("curl --fail http://localhost:8095/") - ''; - } -) + testScript = '' + machine.wait_for_unit("zoneminder.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(8095) + machine.succeed("curl --fail http://localhost:8095/") + ''; +}