diff options
author | 6t8k <58048945+6t8k@users.noreply.github.com> | 2023-10-09 20:54:14 +0200 |
---|---|---|
committer | 6t8k <58048945+6t8k@users.noreply.github.com> | 2023-10-09 20:54:14 +0200 |
commit | ebec07fd244410736b00990fa3609f6a9c3bfdef (patch) | |
tree | 10713d6d01e570095df54acd2e5a88f63fed147f /nixos/tests/openssh.nix | |
parent | 38aa96fc39c9719994f08100f791c27d31ee7892 (diff) |
nixos/tests/openssh: wait for sshd(.socket) units, add timeout=30
Motivated by recently observed flakiness of this test on Hydra: [1] https://github.com/NixOS/nixpkgs/pull/259051#issuecomment-1752363951 [2] https://hydra.nixos.org/build/237478399
Diffstat (limited to 'nixos/tests/openssh.nix')
-rw-r--r-- | nixos/tests/openssh.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/tests/openssh.nix b/nixos/tests/openssh.nix index e88625678fec3..754ac3f2523f5 100644 --- a/nixos/tests/openssh.nix +++ b/nixos/tests/openssh.nix @@ -90,7 +90,12 @@ in { testScript = '' start_all() - server.wait_for_unit("sshd") + server.wait_for_unit("sshd", timeout=30) + server_localhost_only.wait_for_unit("sshd", timeout=30) + server_match_rule.wait_for_unit("sshd", timeout=30) + + server_lazy.wait_for_unit("sshd.socket", timeout=30) + server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30) with subtest("manual-authkey"): client.succeed("mkdir -m 700 /root/.ssh") |