Close agent logs during tests #11102 (comment)

Author: jglick

core/src/main/java/hudson/slaves/SlaveComputer.java

@@ -916,19 +916,23 @@ public Object getTarget() {
     protected void kill() {
         super.kill();
         closeChannel();
-        try {
-            log.close();
-        } catch (IOException x) {
-            LOGGER.log(Level.WARNING, "Failed to close agent log", x);
-        }
-
+        closeLog();
         try {
             Util.deleteRecursive(getLogDir());
         } catch (IOException ex) {
             logger.log(Level.WARNING, "Unable to delete agent logs", ex);
         }
     }
 
+    @Restricted(NoExternalUse.class)
+    public void closeLog() {
+        try {
+            log.close();
+        } catch (IOException x) {
+            LOGGER.log(Level.WARNING, "Failed to close agent log", x);
+        }
+    }
+
     @Override
     public RetentionStrategy getRetentionStrategy() {
         Slave n = getNode();

core/src/main/java/jenkins/model/Jenkins.java

@@ -176,6 +176,7 @@
 import hudson.slaves.NodeProvisioner;
 import hudson.slaves.OfflineCause;
 import hudson.slaves.RetentionStrategy;
+import hudson.slaves.SlaveComputer;
 import hudson.tasks.BuildWrapper;
 import hudson.tasks.Builder;
 import hudson.tasks.Publisher;
@@ -3776,6 +3777,9 @@ private Set<Future<?>> _cleanUpDisconnectComputers(final List<Throwable> errors)
                 try {
                     c.interrupt();
                     c.setNumExecutors(0);
+                    if (Main.isUnitTest && c instanceof SlaveComputer sc) {
+                        sc.closeLog(); // help TemporaryDirectoryAllocator.dispose esp. on Windows
+                    }
                     pending.add(c.disconnect(null));
                 } catch (OutOfMemoryError e) {
                     // we should just propagate this, no point trying to log