mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 06:31:02 +00:00
Code Issues Wiki Activity

nixos/tests/acme: fix on i686, improve timing (#40410)

Browse source 
... to prevent non-deterministic failures
This commit is contained in:
xeji 2018-05-13 19:59:59 +02:00 committed by GitHub
parent 66d204188b
commit 642bed4b3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/tests/acme.nix
View file

@ -54,9 +54,11 @@ in import ./make-test.nix {
}; };
testScript = '' testScript = ''
$letsencrypt->waitForUnit("default.target");
$letsencrypt->waitForUnit("boulder.service"); $letsencrypt->waitForUnit("boulder.service");
startAll; $webserver->waitForUnit("default.target");
$webserver->waitForUnit("acme-certificates.target"); $webserver->waitForUnit("acme-certificates.target");
$client->waitForUnit("default.target");
$client->succeed('curl https://example.com/ | grep -qF "hello world"'); $client->succeed('curl https://example.com/ | grep -qF "hello world"');
''; '';
} }

4
nixos/tests/common/letsencrypt.nix
View file

@ -386,6 +386,10 @@ in {
services.nginx.enable = true; services.nginx.enable = true;
services.nginx.recommendedProxySettings = true; services.nginx.recommendedProxySettings = true;
# This fixes the test on i686
services.nginx.commonHttpConfig = ''
server_names_hash_bucket_size 64;
'';
services.nginx.virtualHosts.${wfeDomain} = { services.nginx.virtualHosts.${wfeDomain} = {
onlySSL = true; onlySSL = true;
enableACME = false; enableACME = false;