summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Rammhold <andreas@rammhold.de>2020-05-09 11:42:22 +0200
committerBjørn Forsman <bjorn.forsman@gmail.com>2020-05-10 15:58:54 +0200
commita432f832bf0de48abf799c34fd703f61c26793ab (patch)
treebea60fc62c689da45ee8ef75ebaaaf5628adae3a
parent88fd82dc2c0a2fe826b18a2a8473afe267ae9482 (diff)
downloadnixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar.gz
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar.bz2
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar.lz
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar.xz
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.tar.zst
nixpkgs-a432f832bf0de48abf799c34fd703f61c26793ab.zip
nixos/tests/gitdaemon: fix spurious test failures due to flaky network
This test is sometimes flaky on hydra as at the time of the `git clone`
the network isn't really configured yet[1]. That problem doesn't seem to
occur locally but if you run it on a machine with high enough load (such
as hydra build machines). Hopefully this will make the test not flaky
anymore.

[1] https://hydra.nixos.org/build/118710378/nixlog/21/raw
-rw-r--r--nixos/tests/gitdaemon.nix3
1 files changed, 3 insertions, 0 deletions
diff --git a/nixos/tests/gitdaemon.nix b/nixos/tests/gitdaemon.nix
index b610caf06fb..c4a707943ef 100644
--- a/nixos/tests/gitdaemon.nix
+++ b/nixos/tests/gitdaemon.nix
@@ -55,6 +55,9 @@ in {
     with subtest("git daemon starts"):
         server.wait_for_unit("git-daemon.service")
 
+    server.wait_for_unit("network-online.target")
+    client.wait_for_unit("network-online.target")
+
     with subtest("client can clone project.git"):
         client.succeed(
             "git clone git://server/project.git /project",