From eccc227bbb0f422b4cb5e6b37bd5f75bc20d9677 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Sat, 26 Mar 2011 21:40:10 -0700 Subject: [PATCH] ensure we release all the background threads --- .../java/org/jvnet/hudson/test/HudsonTestCase.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index d44b8635a6..b8fe24fae5 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -118,9 +118,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Enumeration; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Set; import java.util.UUID; import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; @@ -229,7 +231,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { /** * Remember {@link WebClient}s that are created, to release them properly. */ - private List> clients = new ArrayList>(); + private List clients = new ArrayList(); /** * JavaScript "debugger" that provides you information about the JavaScript call stack @@ -336,11 +338,10 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { protected void tearDown() throws Exception { try { // cancel pending asynchronous operations, although this doesn't really seem to be working - for (WeakReference client : clients) { - WebClient c = client.get(); - if(c==null) continue; + for (WebClient client : clients) { // unload the page to cancel asynchronous operations - c.getPage("about:blank"); + client.getPage("about:blank"); + client.closeAllWindows(); } clients.clear(); } finally { @@ -1414,7 +1415,7 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { // setJavaScriptEnabled(false); setPageCreator(HudsonPageCreator.INSTANCE); - clients.add(new WeakReference(this)); + clients.add(this); // make ajax calls run as post-action for predictable behaviors that simplify debugging setAjaxController(new AjaxController() { public boolean processSynchron(HtmlPage page, WebRequestSettings settings, boolean async) {