[FLINK-6659] fix SavepointITCase leaving temporary data behind

-> use a JUnit '@Rule' that does the cleanup

This closes #3962.


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

Branch: refs/heads/master
Commit: fe6714760b0feb688aa2e8169b1a73028e42afd4
Parents: b58a420
Author: Nico Kruber <[email protected]>
Authored: Mon May 22 16:55:39 2017 +0200
Committer: zentol <[email protected]>
Committed: Wed May 24 16:46:03 2017 +0200

----------------------------------------------------------------------
 .../org/apache/flink/test/checkpointing/SavepointITCase.java  | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/fe671476/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
----------------------------------------------------------------------
diff --git 
a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
 
b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
index 72a1b63..1c8a429 100644
--- 
a/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
+++ 
b/flink-tests/src/test/java/org/apache/flink/test/checkpointing/SavepointITCase.java
@@ -68,7 +68,6 @@ import 
org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.ResponseS
 import 
org.apache.flink.runtime.testingUtils.TestingJobManagerMessages.WaitForAllVerticesToBeRunning;
 import org.apache.flink.runtime.testingUtils.TestingTaskManagerMessages;
 import 
org.apache.flink.runtime.testingUtils.TestingTaskManagerMessages.ResponseSubmitTaskListener;
-import org.apache.flink.runtime.testutils.CommonTestUtils;
 import org.apache.flink.streaming.api.checkpoint.ListCheckpointed;
 import org.apache.flink.streaming.api.datastream.DataStream;
 import org.apache.flink.streaming.api.datastream.IterativeStream;
@@ -143,7 +142,7 @@ public class SavepointITCase extends TestLogger {
                final int numSlotsPerTaskManager = 2;
                final int parallelism = numTaskManagers * 
numSlotsPerTaskManager;
                final Deadline deadline = new FiniteDuration(5, 
TimeUnit.MINUTES).fromNow();
-               final File testRoot = folder.newFolder();
+               final File testRoot = folder.getRoot();
 
                TestingCluster flink = null;
 
@@ -424,7 +423,7 @@ public class SavepointITCase extends TestLogger {
                // Test deadline
                final Deadline deadline = new FiniteDuration(5, 
TimeUnit.MINUTES).fromNow();
 
-               final File tmpDir = CommonTestUtils.createTempDirectory();
+               final File tmpDir = folder.getRoot();
                final File savepointDir = new File(tmpDir, "savepoints");
 
                TestingCluster flink = null;
@@ -494,7 +493,7 @@ public class SavepointITCase extends TestLogger {
                // Test deadline
                final Deadline deadline = new FiniteDuration(5, 
TimeUnit.MINUTES).fromNow();
 
-               final File tmpDir = CommonTestUtils.createTempDirectory();
+               final File tmpDir = folder.getRoot();
                final File savepointDir = new File(tmpDir, "savepoints");
 
                TestingCluster flink = null;

Reply via email to