From 64ee6bf87bc1f657ad6067a5db6ed5f302f16692 Mon Sep 17 00:00:00 2001 From: Jesse Glick Date: Tue, 19 Dec 2023 03:04:02 -0500 Subject: [PATCH] Fixing use of `Timeout` (#464) --- .../plugins/sshslaves/agents/AgentConnectionBase.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/test/java/hudson/plugins/sshslaves/agents/AgentConnectionBase.java b/src/test/java/hudson/plugins/sshslaves/agents/AgentConnectionBase.java index f0891bee..5ae3f327 100644 --- a/src/test/java/hudson/plugins/sshslaves/agents/AgentConnectionBase.java +++ b/src/test/java/hudson/plugins/sshslaves/agents/AgentConnectionBase.java @@ -46,11 +46,15 @@ public class AgentConnectionBase { @ClassRule public static CheckIsDockerAvailable isDockerAvailable = new CheckIsDockerAvailable(); - @Rule + @Rule(order = 10) public JenkinsRule j = new JenkinsRule(); - @Rule - public Timeout globalTimeout= new Timeout(4, TimeUnit.MINUTES); + @Rule(order = -10) + public Timeout globalTimeout = Timeout.builder().withTimeout(10, TimeUnit.MINUTES).withLookingForStuckThread(true).build(); + + protected AgentConnectionBase() { + j.timeout = 0; + } protected boolean isSuccessfullyConnected(Node node) throws IOException, InterruptedException { int count = 0;