nixosTests.caddy: migrate to runTest

Part of #386873
This commit is contained in:
Piotr Kwiecinski 2025-04-02 12:35:10 +02:00
parent b155892af9
commit 808927def5
No known key found for this signature in database
GPG key ID: EC0DE1CB9D5258B4
2 changed files with 135 additions and 137 deletions

View file

@ -270,7 +270,7 @@ in
buildbot = runTest ./buildbot.nix; buildbot = runTest ./buildbot.nix;
buildkite-agents = handleTest ./buildkite-agents.nix { }; buildkite-agents = handleTest ./buildkite-agents.nix { };
c2fmzq = handleTest ./c2fmzq.nix { }; c2fmzq = handleTest ./c2fmzq.nix { };
caddy = handleTest ./caddy.nix { }; caddy = runTest ./caddy.nix;
cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { }; cadvisor = handleTestOn [ "x86_64-linux" ] ./cadvisor.nix { };
cage = handleTest ./cage.nix { }; cage = handleTest ./cage.nix { };
cagebreak = handleTest ./cagebreak.nix { }; cagebreak = handleTest ./cagebreak.nix { };

View file

@ -1,6 +1,5 @@
import ./make-test-python.nix ( { pkgs, ... }:
{ pkgs, ... }: {
{
name = "caddy"; name = "caddy";
meta = with pkgs.lib.maintainers; { meta = with pkgs.lib.maintainers; {
maintainers = [ maintainers = [
@ -151,5 +150,4 @@ import ./make-test-python.nix (
webserver.wait_for_open_port(80) webserver.wait_for_open_port(80)
webserver.succeed("curl http://localhost | grep caddy") webserver.succeed("curl http://localhost | grep caddy")
''; '';
} }
)