public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #127141 from NixOS/backport-125770-to-release-21.05

Browse Source 
[Backport release-21.05] nixos/acme: Remove an incorrect assertion from tests
This commit is contained in:
Martin Weinelt 2021-06-17 00:55:45 +02:00 committed by GitHub
commit 36bb4e1ebe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nixos/tests/acme.nix
View File

@ -392,14 +392,11 @@ in import ./make-test-python.nix ({ lib, ... }: {
# Check the key hash before and after adding an alias. It should not change. # Check the key hash before and after adding an alias. It should not change.
# The previous test reverts the ed384 change # The previous test reverts the ed384 change
webserver.wait_for_unit("acme-finished-a.example.test.target") webserver.wait_for_unit("acme-finished-a.example.test.target")
keyhash_old = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem")
switch_to(webserver, "nginx-aliases") switch_to(webserver, "nginx-aliases")
webserver.wait_for_unit("acme-finished-a.example.test.target") webserver.wait_for_unit("acme-finished-a.example.test.target")
check_issuer(webserver, "a.example.test", "pebble") check_issuer(webserver, "a.example.test", "pebble")
check_connection(client, "a.example.test") check_connection(client, "a.example.test")
check_connection(client, "b.example.test") check_connection(client, "b.example.test")
keyhash_new = webserver.succeed("md5sum /var/lib/acme/a.example.test/key.pem")
assert keyhash_old == keyhash_new
with subtest("Can request certificates for vhost + aliases (apache-httpd)"): with subtest("Can request certificates for vhost + aliases (apache-httpd)"):
try: try: