You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/01/10 16:27:29 UTC
[5/5] flink git commit: [hotfix] [tests] Fix PageRankITCase,
AggregatorsITCase and DataSinkITCase to use fresh result path
[hotfix] [tests] Fix PageRankITCase, AggregatorsITCase and DataSinkITCase to use fresh result path
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/d42759d0
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/d42759d0
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/d42759d0
Branch: refs/heads/master
Commit: d42759d0a17d17adc5af9c26b939d431acba5b08
Parents: a6ee040
Author: Till Rohrmann <tr...@apache.org>
Authored: Fri Dec 1 19:20:35 2017 +0100
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed Jan 10 17:14:15 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/flink/core/fs/FileSystem.java | 2 +-
.../org/apache/flink/test/example/java/PageRankITCase.java | 6 +++++-
.../flink/test/iterative/aggregators/AggregatorsITCase.java | 8 +++++---
.../java/org/apache/flink/test/operators/DataSinkITCase.java | 6 +++++-
4 files changed, 16 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/d42759d0/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
index 07a1e76..8698595 100644
--- a/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
+++ b/flink-core/src/main/java/org/apache/flink/core/fs/FileSystem.java
@@ -752,7 +752,7 @@ public abstract class FileSystem {
return true;
} else {
// file may not be overwritten
- throw new IOException("File or directory already exists. Existing files and directories " +
+ throw new IOException("File or directory " + outPath + " already exists. Existing files and directories " +
"are not overwritten in " + WriteMode.NO_OVERWRITE.name() + " mode. Use " +
WriteMode.OVERWRITE.name() + " mode to overwrite existing files and directories.");
}
http://git-wip-us.apache.org/repos/asf/flink/blob/d42759d0/flink-tests/src/test/java/org/apache/flink/test/example/java/PageRankITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/example/java/PageRankITCase.java b/flink-tests/src/test/java/org/apache/flink/test/example/java/PageRankITCase.java
index ee7bf82..2fae57d 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/example/java/PageRankITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/example/java/PageRankITCase.java
@@ -33,6 +33,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.File;
+import java.util.UUID;
/**
* Test for {@link PageRank}.
@@ -54,7 +55,10 @@ public class PageRankITCase extends MultipleProgramsTestBase {
@Before
public void before() throws Exception{
- resultPath = tempFolder.newFile().toURI().toString();
+ final File folder = tempFolder.newFolder();
+ final File resultFile = new File(folder, UUID.randomUUID().toString());
+ resultPath = resultFile.toURI().toString();
+
File verticesFile = tempFolder.newFile();
FileUtils.writeFileUtf8(verticesFile, PageRankData.VERTICES);
http://git-wip-us.apache.org/repos/asf/flink/blob/d42759d0/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
index 64ee98a..bd42ac2 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/iterative/aggregators/AggregatorsITCase.java
@@ -49,6 +49,7 @@ import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.util.Random;
+import java.util.UUID;
import static org.junit.Assert.assertEquals;
@@ -78,9 +79,10 @@ public class AggregatorsITCase extends MultipleProgramsTestBase {
@Before
public void before() throws Exception{
- File tempFile = tempFolder.newFile();
- testPath = tempFile.toString();
- resultPath = tempFile.toURI().toString();
+ final File folder = tempFolder.newFolder();
+ final File resultFile = new File(folder, UUID.randomUUID().toString());
+ testPath = resultFile.toString();
+ resultPath = resultFile.toURI().toString();
}
@After
http://git-wip-us.apache.org/repos/asf/flink/blob/d42759d0/flink-tests/src/test/java/org/apache/flink/test/operators/DataSinkITCase.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/operators/DataSinkITCase.java b/flink-tests/src/test/java/org/apache/flink/test/operators/DataSinkITCase.java
index deb5170..b35e818 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/operators/DataSinkITCase.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/operators/DataSinkITCase.java
@@ -35,7 +35,9 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
import java.io.BufferedReader;
+import java.io.File;
import java.util.Random;
+import java.util.UUID;
import static org.junit.Assert.assertTrue;
@@ -57,7 +59,9 @@ public class DataSinkITCase extends MultipleProgramsTestBase {
@Before
public void before() throws Exception{
- resultPath = tempFolder.newFile().toURI().toString();
+ final File folder = tempFolder.newFolder();
+ final File resultFile = new File(folder, UUID.randomUUID().toString());
+ resultPath = resultFile.toURI().toString();
}
@Test