diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 4fd1c64693ac..a6c84fe08ba6 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -605,7 +605,7 @@ in gns3-server = runTest ./gns3-server.nix; gnupg = runTest ./gnupg.nix; goatcounter = runTest ./goatcounter.nix; - go-camo = handleTest ./go-camo.nix { }; + go-camo = runTest ./go-camo.nix; go-neb = runTest ./go-neb.nix; gobgpd = runTest ./gobgpd.nix; gocd-agent = runTest ./gocd-agent.nix; diff --git a/nixos/tests/go-camo.nix b/nixos/tests/go-camo.nix index f53d5417ce74..d68bbde537b5 100644 --- a/nixos/tests/go-camo.nix +++ b/nixos/tests/go-camo.nix @@ -1,36 +1,26 @@ +{ lib, ... }: +let + key_val = "12345678"; +in { - system ? builtins.currentSystem, - config ? { }, - pkgs ? import ../.. { inherit system config; }, -}: + name = "go-camo-file-key"; + meta = { + maintainers = [ lib.maintainers.viraptor ]; + }; -with import ../lib/testing-python.nix { inherit system pkgs; }; - -{ - gocamo_file_key = - let - key_val = "12345678"; - in - makeTest { - name = "go-camo-file-key"; - meta = { - maintainers = [ pkgs.lib.maintainers.viraptor ]; + nodes.machine = + { pkgs, ... }: + { + services.go-camo = { + enable = true; + keyFile = pkgs.writeText "foo" key_val; }; - - nodes.machine = - { config, pkgs, ... }: - { - services.go-camo = { - enable = true; - keyFile = pkgs.writeText "foo" key_val; - }; - }; - - # go-camo responds to http requests - testScript = '' - machine.wait_for_unit("go-camo.service") - machine.wait_for_open_port(8080) - machine.succeed("curl http://localhost:8080") - ''; }; + + # go-camo responds to http requests + testScript = '' + machine.wait_for_unit("go-camo.service") + machine.wait_for_open_port(8080) + machine.succeed("curl http://localhost:8080") + ''; }