commit 2669800d72e5b88dba49eef7ba3a719233310ed8
author Steve Loughran <stevel@apache.org> Tue Nov 04 15:51:28 2014 +0000
committer Steve Loughran <stevel@apache.org> Tue Nov 04 17:18:10 2014 +0000
tree 6674487392befa7367a3e514beb7af4a4e520ec7
parent 878809eece4888f85c2915fade7f8b1b2e66415e

SLIDER-201 make test teardown more resilient

slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy

diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
index c2ea54a..e8bc4b2 100644
--- a/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/AgentMiniClusterTestBase.groovy
@@ -44,7 +44,6 @@
 extends YarnZKMiniClusterTestBase {
   protected static File agentConf
   protected static File agentDef
-  protected static File imagePath
   protected static Map<String, String> agentDefOptions
   private static TemporaryFolder tempFolder = new TemporaryFolder();
 
@@ -89,13 +88,16 @@
 
   @AfterClass
   public static void cleanSubConfFiles() {
-    def tempRoot = tempFolder.root
-    if (tempRoot.exists()) {
-      try {
+    def tempRoot
+    try {
+      tempRoot = tempFolder.root
+      if (tempRoot.exists()) {
         FileUtils.deleteDirectory(tempRoot);
-      } catch (IOException e) {
-        log.info("Failed to delete $tempRoot :$e", e)
       }
+    } catch (IOException e) {
+      log.info("Failed to delete $tempRoot :$e", e)
+    } catch (IllegalStateException e) {
+      log.warn("Temp folder deletion failed: $e")
     }
   }