From 8269a73476a2690567e59a85cc83cd3a01d70f6d Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Thu, 17 Dec 2009 01:01:54 +0000
Subject: [PATCH] clean up the tmp file after a test

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@24667 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/test/java/hudson/LauncherTest.java | 45 ++++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/core/src/test/java/hudson/LauncherTest.java b/core/src/test/java/hudson/LauncherTest.java
index ccdc065e6a..e0abe175ed 100644
--- a/core/src/test/java/hudson/LauncherTest.java
+++ b/core/src/test/java/hudson/LauncherTest.java
@@ -41,27 +41,32 @@ public class LauncherTest extends ChannelTestCase {
 
         File tmp = File.createTempFile("testRemoteKill", "");
         tmp.delete();
-        FilePath f = new FilePath(french, tmp.getPath());
-        Launcher l = f.createLauncher(new StreamTaskListener(System.err));
-        Proc p = l.launch().cmds("sh", "-c", "echo $$$$ > "+tmp+"; sleep 30").stdout(System.out).stderr(System.err).start();
-        while (!tmp.exists())
-            Thread.sleep(100);
-        long start = System.currentTimeMillis();
-        p.kill();
-        assertTrue(p.join()!=0);
-        long end = System.currentTimeMillis();
-        assertTrue("join finished promptly", (end - start < 5000));
-        french.call(NOOP); // this only returns after the other side of the channel has finished executing cancellation
-        Thread.sleep(2000); // more delay to make sure it's gone
-        assertNull("process should be gone",ProcessTree.get().get(Integer.parseInt(FileUtils.readFileToString(tmp).trim())));
 
-        // Manual version of test: set up instance w/ one slave. Now in script console
-        // new hudson.FilePath(new java.io.File("/tmp")).createLauncher(new hudson.util.StreamTaskListener(System.err)).
-        //   launch().cmds("sleep", "1d").stdout(System.out).stderr(System.err).start().kill()
-        // returns immediately and pgrep sleep => nothing. But without fix
-        // hudson.model.Hudson.instance.nodes[0].rootPath.createLauncher(new hudson.util.StreamTaskListener(System.err)).
-        //   launch().cmds("sleep", "1d").stdout(System.out).stderr(System.err).start().kill()
-        // hangs and on slave machine pgrep sleep => one process; after manual kill, script returns.
+        try {
+            FilePath f = new FilePath(french, tmp.getPath());
+            Launcher l = f.createLauncher(new StreamTaskListener(System.err));
+            Proc p = l.launch().cmds("sh", "-c", "echo $$$$ > "+tmp+"; sleep 30").stdout(System.out).stderr(System.err).start();
+            while (!tmp.exists())
+                Thread.sleep(100);
+            long start = System.currentTimeMillis();
+            p.kill();
+            assertTrue(p.join()!=0);
+            long end = System.currentTimeMillis();
+            assertTrue("join finished promptly", (end - start < 5000));
+            french.call(NOOP); // this only returns after the other side of the channel has finished executing cancellation
+            Thread.sleep(2000); // more delay to make sure it's gone
+            assertNull("process should be gone",ProcessTree.get().get(Integer.parseInt(FileUtils.readFileToString(tmp).trim())));
+
+            // Manual version of test: set up instance w/ one slave. Now in script console
+            // new hudson.FilePath(new java.io.File("/tmp")).createLauncher(new hudson.util.StreamTaskListener(System.err)).
+            //   launch().cmds("sleep", "1d").stdout(System.out).stderr(System.err).start().kill()
+            // returns immediately and pgrep sleep => nothing. But without fix
+            // hudson.model.Hudson.instance.nodes[0].rootPath.createLauncher(new hudson.util.StreamTaskListener(System.err)).
+            //   launch().cmds("sleep", "1d").stdout(System.out).stderr(System.err).start().kill()
+            // hangs and on slave machine pgrep sleep => one process; after manual kill, script returns.
+        } finally {
+            tmp.delete();
+        }
     }
 
     private static final Callable<Object,RuntimeException> NOOP = new Callable() {
-- 
GitLab