diff options
author | xeji <36407913+xeji@users.noreply.github.com> | 2018-05-13 19:59:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-13 19:59:59 +0200 |
commit | 642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f (patch) | |
tree | 7e750fb9106caa5687060b8ac045282e9f6683cd /nixos/tests | |
parent | 66d204188b21e3156907e66165c2898076145bd2 (diff) | |
download | nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar.gz nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar.bz2 nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar.lz nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar.xz nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.tar.zst nixlib-642bed4b3e0d1b0a8f8d9bfea8d5c99cf7941c2f.zip |
nixos/tests/acme: fix on i686, improve timing (#40410)
... to prevent non-deterministic failures
Diffstat (limited to 'nixos/tests')
-rw-r--r-- | nixos/tests/acme.nix | 4 | ||||
-rw-r--r-- | nixos/tests/common/letsencrypt.nix | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/nixos/tests/acme.nix b/nixos/tests/acme.nix index d7452744e17b..21b0fedcfefe 100644 --- a/nixos/tests/acme.nix +++ b/nixos/tests/acme.nix @@ -54,9 +54,11 @@ in import ./make-test.nix { }; testScript = '' + $letsencrypt->waitForUnit("default.target"); $letsencrypt->waitForUnit("boulder.service"); - startAll; + $webserver->waitForUnit("default.target"); $webserver->waitForUnit("acme-certificates.target"); + $client->waitForUnit("default.target"); $client->succeed('curl https://example.com/ | grep -qF "hello world"'); ''; } diff --git a/nixos/tests/common/letsencrypt.nix b/nixos/tests/common/letsencrypt.nix index 10cde45d18a8..7c6b3b29e36d 100644 --- a/nixos/tests/common/letsencrypt.nix +++ b/nixos/tests/common/letsencrypt.nix @@ -386,6 +386,10 @@ in { services.nginx.enable = true; services.nginx.recommendedProxySettings = true; + # This fixes the test on i686 + services.nginx.commonHttpConfig = '' + server_names_hash_bucket_size 64; + ''; services.nginx.virtualHosts.${wfeDomain} = { onlySSL = true; enableACME = false; |