diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-05-14 10:57:33 -0400 |
| commit | 8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25 (patch) | |
| tree | f6498b73e5b1201d1af141b53913d996d5f187a9 /nixos/tests | |
| parent | 3a4eda2e38fd80e6c9bd36606e9da16a47e41922 (diff) | |
| parent | 640c9779968bb98a047aa2d59770a7d3daa35871 (diff) | |
| download | nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.gz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.bz2 nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.lz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.xz nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.tar.zst nixlib-8e891e6ed47c6cffd9ebab6cce0835cb5f0a9b25.zip | |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/acme.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/common/letsencrypt.nix | 4 | ||||
| -rw-r--r-- | nixos/tests/mesos.nix | 4 |
3 files changed, 10 insertions, 2 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; diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix index 34671df047c8..007d7ac21603 100644 --- a/nixos/tests/mesos.nix +++ b/nixos/tests/mesos.nix @@ -66,9 +66,11 @@ import ./make-test.nix ({ pkgs, ...} : rec { testScript = '' startAll; + $master->waitForUnit("zookeeper.service"); $master->waitForUnit("mesos-master.service"); + $slave->waitForUnit("docker.service"); $slave->waitForUnit("mesos-slave.service"); - + $master->waitForOpenPort(2181); $master->waitForOpenPort(5050); $slave->waitForOpenPort(5051); |