From 1627f19331ff55b1c177c50af48a686b79b83e4e Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Thu, 26 Feb 2026 00:50:17 +0100 Subject: [PATCH 1/2] tests/infrastructure: Fix flaky subtest --- tests/infrastructure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix index 8d97be8..9650038 100644 --- a/tests/infrastructure/default.nix +++ b/tests/infrastructure/default.nix @@ -159,9 +159,9 @@ with subtest("SSH access restricted by role"): client1.succeed("ssh ${sshOptions} seb@server 'echo Hello'") client1.succeed("ssh ${sshOptions} seb@client2 'echo Hello'") - server.fail("ssh ${sshOptions} seb@client2 'echo Hello'") + server.fail("timeout 5 ssh ${sshOptions} seb@client2 'echo Hello'") with subtest("SSH not reachable on underlay"): - client1.fail("ssh ${sshOptions} seb@${serverNetCfg.underlay.address} 'echo Hello'") + client1.fail("timeout 5 ssh ${sshOptions} seb@${serverNetCfg.underlay.address} 'echo Hello'") ''; } From caebd6e24187e5f699979424c104a0b9abda9e63 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Thu, 26 Feb 2026 00:56:42 +0100 Subject: [PATCH 2/2] tests/infrastructure: Apply ssh timeout to all ssh tests --- tests/infrastructure/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/infrastructure/default.nix b/tests/infrastructure/default.nix index 9650038..c15a5bd 100644 --- a/tests/infrastructure/default.nix +++ b/tests/infrastructure/default.nix @@ -123,7 +123,7 @@ client1NetCfg = nodes.client1.custom.networking; client2NetCfg = nodes.client2.custom.networking; - sshOptions = "-i /etc/ssh-key -o BatchMode=yes -o ConnectTimeout=3 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"; + ssh = "timeout 5 ssh -i /etc/ssh-key -o BatchMode=yes -o ConnectTimeout=3 -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"; in '' start_all() @@ -157,11 +157,11 @@ server.succeed("ping -c 1 client2") with subtest("SSH access restricted by role"): - client1.succeed("ssh ${sshOptions} seb@server 'echo Hello'") - client1.succeed("ssh ${sshOptions} seb@client2 'echo Hello'") - server.fail("timeout 5 ssh ${sshOptions} seb@client2 'echo Hello'") + client1.succeed("${ssh} seb@server 'echo Hello'") + client1.succeed("${ssh} seb@client2 'echo Hello'") + server.fail("${ssh} seb@client2 'echo Hello'") with subtest("SSH not reachable on underlay"): - client1.fail("timeout 5 ssh ${sshOptions} seb@${serverNetCfg.underlay.address} 'echo Hello'") + client1.fail("${ssh} seb@${serverNetCfg.underlay.address} 'echo Hello'") ''; }