JenkinsSessionRule seems to solve that issue

Author: jglick

src/test/java/com/cloudbees/jenkins/support/impl/NodeRemoteDirectoryComponentTest.java

@@ -11,36 +11,28 @@
 import java.nio.file.StandardOpenOption;
 import java.util.Map;
 import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
-import org.jvnet.hudson.test.JenkinsRule;
+import org.jvnet.hudson.test.JenkinsSessionRule;
 
 /**
  * Tests for the {@link NodeRemoteDirectoryComponent}
  */
 public class NodeRemoteDirectoryComponentTest {
 
     @Rule
-    public JenkinsRule j = new JenkinsRule();
+    public JenkinsSessionRule r = new JenkinsSessionRule();
 
-    @BeforeClass
-    public static void clearLog() throws Exception {
+    @Before
+    public void clearLog() throws Throwable {
         try (var os =
                 Files.newOutputStream(SafeLog.file, StandardOpenOption.CREATE, StandardOpenOption.TRUNCATE_EXISTING)) {}
         System.err.println("Cleared " + SafeLog.file);
     }
 
     @After
-    public void showLog() throws Exception {
-        System.err.println("---%<--- " + SafeLog.file);
-        Files.copy(SafeLog.file, System.err);
-        System.err.println("--->%--- ");
-    }
-
-    @AfterClass
-    public static void showFinalLog() throws Exception {
+    public void showLog() throws Throwable {
         System.err.println("---%<--- " + SafeLog.file);
         Files.copy(SafeLog.file, System.err);
         System.err.println("--->%--- ");
@@ -50,61 +42,69 @@ public static void showFinalLog() throws Exception {
      * Test adding agent remote directory content with the defaults.
      */
     @Test
-    public void addContents() throws Exception {
-        DumbSlave agent = j.createOnlineSlave(Label.parseExpression("test"), null);
+    public void addContents() throws Throwable {
+        r.then(j -> {
+            DumbSlave agent = j.createOnlineSlave(Label.parseExpression("test"), null);
 
-        Map<String, String> output =
-                SupportTestUtils.invokeComponentToMap(new NodeRemoteDirectoryComponent(), agent.toComputer());
+            Map<String, String> output =
+                    SupportTestUtils.invokeComponentToMap(new NodeRemoteDirectoryComponent(), agent.toComputer());
 
-        String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
-        assertTrue(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+            String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
+            assertTrue(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+        });
     }
 
     /*
      * Test adding agent remote directory content with excludes pattern(s).
      */
     @Test
-    public void addContentsWithExcludes() throws Exception {
-        DumbSlave agent = j.createSlave("agent1", "test", null);
-        agent.getComputer().connect(false).get();
-        j.waitOnline(agent);
-
-        Map<String, String> output = SupportTestUtils.invokeComponentToMap(
-                new NodeRemoteDirectoryComponent("", "**/*.log", true, 10), agent.toComputer());
-
-        String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
-        assertFalse(output.keySet().stream().anyMatch(key -> key.matches(prefix + ".*/.*.log")));
+    public void addContentsWithExcludes() throws Throwable {
+        r.then(j -> {
+            DumbSlave agent = j.createSlave("agent1", "test", null);
+            agent.getComputer().connect(false).get();
+            j.waitOnline(agent);
+
+            Map<String, String> output = SupportTestUtils.invokeComponentToMap(
+                    new NodeRemoteDirectoryComponent("", "**/*.log", true, 10), agent.toComputer());
+
+            String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
+            assertFalse(output.keySet().stream().anyMatch(key -> key.matches(prefix + ".*/.*.log")));
+        });
     }
 
     /*
      * Test adding agent remote directory content with includes pattern(s).
      */
     @Test
-    public void addContentsWithIncludes() throws Exception {
-        DumbSlave agent = j.createSlave("agent1", "test", null);
-        agent.getComputer().connect(false).get();
-        j.waitOnline(agent);
-
-        Map<String, String> output = SupportTestUtils.invokeComponentToMap(
-                new NodeRemoteDirectoryComponent("support/*.log", "", true, 10), agent.toComputer());
-
-        String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
-        assertTrue(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+    public void addContentsWithIncludes() throws Throwable {
+        r.then(j -> {
+            DumbSlave agent = j.createSlave("agent1", "test", null);
+            agent.getComputer().connect(false).get();
+            j.waitOnline(agent);
+
+            Map<String, String> output = SupportTestUtils.invokeComponentToMap(
+                    new NodeRemoteDirectoryComponent("support/*.log", "", true, 10), agent.toComputer());
+
+            String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
+            assertTrue(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+        });
     }
 
     /*
      * Test adding agent remote directory content with includes pattern(s).
      */
     @Test
-    public void addContentsWithMaxDepth() throws Exception {
-        DumbSlave agent = j.createSlave("agent1", "test", null);
-        agent.getComputer().connect(false).get();
-        j.waitOnline(agent);
-
-        Map<String, String> output = SupportTestUtils.invokeComponentToMap(
-                new NodeRemoteDirectoryComponent("", "", true, 1), agent.toComputer());
-
-        String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
-        assertFalse(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+    public void addContentsWithMaxDepth() throws Throwable {
+        r.then(j -> {
+            DumbSlave agent = j.createSlave("agent1", "test", null);
+            agent.getComputer().connect(false).get();
+            j.waitOnline(agent);
+
+            Map<String, String> output = SupportTestUtils.invokeComponentToMap(
+                    new NodeRemoteDirectoryComponent("", "", true, 1), agent.toComputer());
+
+            String prefix = "nodes/slave/" + agent.getNodeName() + "/remote";
+            assertFalse(output.keySet().stream().anyMatch(key -> key.matches(prefix + "/support/.*.log")));
+        });
     }
 }