Merge pull request #171488 from K900/openssh-test-timeouts

nixos/tests/openssh: add timeouts to all ssh invocations
This commit is contained in:
Rick van Schijndel 2022-05-04 20:05:46 +02:00 committed by GitHub
commit 14ad619e32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -80,17 +80,21 @@ in {
client.wait_for_unit("network.target") client.wait_for_unit("network.target")
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'echo hello world' >&2",
timeout=30
) )
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server 'ulimit -l' | grep 1024",
timeout=30
) )
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'echo hello world' >&2",
timeout=30
) )
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no server_lazy 'ulimit -l' | grep 1024",
timeout=30
) )
with subtest("configured-authkey"): with subtest("configured-authkey"):
@ -99,10 +103,12 @@ in {
) )
client.succeed("chmod 600 privkey.snakeoil") client.succeed("chmod 600 privkey.snakeoil")
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server true",
timeout=30
) )
client.succeed( client.succeed(
"ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true" "ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i privkey.snakeoil server_lazy true",
timeout=30
) )
with subtest("localhost-only"): with subtest("localhost-only"):