c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

nixos/openssh: tests: Ease systemd unit timeouts to 60 seconds

Browse source 
Multiple VMs starting on my i5 laptop seems to fail around 38 seconds.
This commit is contained in:
Jonathan Davies 2025-12-25 15:55:03 +00:00
commit 2d05df9e88
No known key found for this signature in database
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
nixos/tests/openssh.nix
View file

@ -290,23 +290,23 @@ in
testScript = ''
start_all()
server.wait_for_unit("sshd", timeout=30)
server_allowed_users.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_no_openssl.wait_for_unit("sshd", timeout=30)
server_no_pam.wait_for_unit("sshd", timeout=30)
server_null_pam.wait_for_unit("sshd", timeout=30)
server.wait_for_unit("sshd", timeout=60)
server_allowed_users.wait_for_unit("sshd", timeout=60)
server_localhost_only.wait_for_unit("sshd", timeout=60)
server_match_rule.wait_for_unit("sshd", timeout=60)
server_no_openssl.wait_for_unit("sshd", timeout=60)
server_no_pam.wait_for_unit("sshd", timeout=60)
server_null_pam.wait_for_unit("sshd", timeout=60)
server_null_pam.fail("journalctl -u sshd.service | grep 'Unsupported option UsePAM'")
server_sftp.wait_for_unit("sshd", timeout=30)
server_sftp.wait_for_unit("sshd", timeout=60)
server_lazy.wait_for_unit("sshd.socket", timeout=30)
server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=30)
server_lazy_socket.wait_for_unit("sshd.socket", timeout=30)
server_lazy.wait_for_unit("sshd.socket", timeout=60)
server_localhost_only_lazy.wait_for_unit("sshd.socket", timeout=60)
server_lazy_socket.wait_for_unit("sshd.socket", timeout=60)
# sshd-keygen is a oneshot unit, so just wait for multi-user.target, which
# pulls it in.
server_no_sshd_with_key.wait_for_unit("multi-user.target", timeout=30)
server_no_sshd_with_key.wait_for_unit("multi-user.target", timeout=60)
with subtest("manual-authkey"):
client.succeed(