fix intermittent deleting-dir test failure by waiting for server shutdown 
before deleting dir


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/a32c3ac3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/a32c3ac3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/a32c3ac3

Branch: refs/heads/master
Commit: a32c3ac3836c55f31418d98f9ad2e2ac7f6f7067
Parents: 6c1c3b2
Author: Alex Heneveld <[email protected]>
Authored: Fri Oct 3 14:49:28 2014 +0100
Committer: Alex Heneveld <[email protected]>
Committed: Fri Oct 3 16:56:03 2014 +0100

----------------------------------------------------------------------
 .../rebind/persister/BrooklynMementoPersisterFileBasedTest.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/a32c3ac3/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java
----------------------------------------------------------------------
diff --git 
a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java
 
b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java
index 7f05fc8..89afd4a 100644
--- 
a/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java
+++ 
b/core/src/test/java/brooklyn/entity/rebind/persister/BrooklynMementoPersisterFileBasedTest.java
@@ -48,8 +48,8 @@ public class BrooklynMementoPersisterFileBasedTest extends 
BrooklynMementoPersis
     @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
-        mementoDir = Os.deleteRecursively(mementoDir).asNullOrThrowing();
         super.tearDown();
+        mementoDir = Os.deleteRecursively(mementoDir).asNullOrThrowing();
     }
 
 }

Reply via email to