movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

caddy: build with default go and fix tests

Browse source
This commit is contained in:
Nick Cao 2021-09-01 15:15:50 +08:00
parent 538f369fb5
commit 83b48cc589
No known key found for this signature in database
GPG key ID: 068A56CEF48FA2C1
2 changed files with 49 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

95
nixos/tests/caddy.nix
View file

@ -50,57 +50,58 @@ import ./make-test-python.nix ({ pkgs, ... }: {
}; };
}; };
}; };
};
testScript = { nodes, ... }: testScript = { nodes, ... }:
let let
etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag"; etagSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/etag";
justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload"; justReloadSystem = "${nodes.webserver.config.system.build.toplevel}/specialisation/config-reload";
multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs"; multipleConfigs = "${nodes.webserver.config.system.build.toplevel}/specialisation/multiple-configs";
in in
'' ''
url = "http://localhost/example.html" url = "http://localhost/example.html"
webserver.wait_for_unit("caddy") webserver.wait_for_unit("caddy")
webserver.wait_for_open_port("80") webserver.wait_for_open_port("80")
def check_etag(url): def check_etag(url):
etag = webserver.succeed( etag = webserver.succeed(
"curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format( "curl --fail -v '{}' 2>&1 | sed -n -e \"s/^< [Ee][Tt][Aa][Gg]: *//p\"".format(
url url
) )
) )
etag = etag.replace("\r\n", " ") etag = etag.replace("\r\n", " ")
http_code = webserver.succeed( http_code = webserver.succeed(
"curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format( "curl --fail --silent --show-error -o /dev/null -w \"%{{http_code}}\" --head -H 'If-None-Match: {}' {}".format(
etag, url etag, url
) )
) )
assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code) assert int(http_code) == 304, "HTTP code is {}, expected 304".format(http_code)
return etag return etag
with subtest("check ETag if serving Nix store paths"): with subtest("check ETag if serving Nix store paths"):
old_etag = check_etag(url) old_etag = check_etag(url)
webserver.succeed( webserver.succeed(
"${etagSystem}/bin/switch-to-configuration test >&2" "${etagSystem}/bin/switch-to-configuration test >&2"
) )
webserver.sleep(1) webserver.sleep(1)
new_etag = check_etag(url) new_etag = check_etag(url)
assert old_etag != new_etag, "Old ETag {} is the same as {}".format( assert old_etag != new_etag, "Old ETag {} is the same as {}".format(
old_etag, new_etag old_etag, new_etag
) )
with subtest("config is reloaded on nixos-rebuild switch"): with subtest("config is reloaded on nixos-rebuild switch"):
webserver.succeed( webserver.succeed(
"${justReloadSystem}/bin/switch-to-configuration test >&2" "${justReloadSystem}/bin/switch-to-configuration test >&2"
) )
webserver.wait_for_open_port("8080") webserver.wait_for_open_port("8080")
with subtest("multiple configs are correctly merged"): with subtest("multiple configs are correctly merged"):
webserver.succeed( webserver.succeed(
"${multipleConfigs}/bin/switch-to-configuration test >&2" "${multipleConfigs}/bin/switch-to-configuration test >&2"
) )
webserver.wait_for_open_port("8080") webserver.wait_for_open_port("8080")
webserver.wait_for_open_port("8081") webserver.wait_for_open_port("8081")
''; '';
}) })

4
pkgs/top-level/all-packages.nix
View file

@ -2180,9 +2180,7 @@ with pkgs;
''; '';
}); });
caddy = callPackage ../servers/caddy { caddy = callPackage ../servers/caddy { };
buildGoModule = buildGo115Module;
};
traefik = callPackage ../servers/traefik { }; traefik = callPackage ../servers/traefik { };