From 0ffe9d591faa5838c21b2859161eb6c23d0bbd62 Mon Sep 17 00:00:00 2001 From: Kohsuke Kawaguchi Date: Wed, 30 May 2012 14:23:12 -0700 Subject: [PATCH] follow-up to 642a57c7ab782898a84d6c2cfa02ae2be2703105 There's no guarantee that the tearDown method completes, so make sure we have clean environment by doing this in the setUp. --- test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java | 3 +++ 1 file changed, 3 insertions(+) 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 3ae7521737..ace3728f9a 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -296,6 +296,9 @@ public abstract class HudsonTestCase extends TestCase implements RootAction { AbstractProject.WORKSPACE.toString(); User.clear(); + // just in case tearDown failed in the middle, make sure to really clean them up so that there's no left-over from earlier tests + ExtensionList.clearLegacyInstances(); + DescriptorExtensionList.clearLegacyInstances(); try { jenkins = hudson = newHudson();