You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2016/05/04 00:06:24 UTC
[37/50] hadoop git commit: MAPREDUCE-6672. TestTeraSort fails on
Windows. Contributed by Tibor Kiss.
MAPREDUCE-6672. TestTeraSort fails on Windows. Contributed by Tibor Kiss.
(cherry picked from commit 26ac0f8f0b28758a6404cd7b4b81d79b61d809d9)
(cherry picked from commit 752a8132832fd59027df5cb1bbedb9b3b7c54681)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/3222dea8
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/3222dea8
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/3222dea8
Branch: refs/heads/branch-2.8
Commit: 3222dea8edf257afc522316c2f4a97ddd96b195a
Parents: 31ed34c
Author: Chris Nauroth <cn...@apache.org>
Authored: Fri Apr 29 11:33:32 2016 -0700
Committer: Chris Nauroth <cn...@apache.org>
Committed: Fri Apr 29 11:33:54 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/examples/terasort/TestTeraSort.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/3222dea8/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
index 391e482..b835a3b 100644
--- a/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
+++ b/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/test/java/org/apache/hadoop/examples/terasort/TestTeraSort.java
@@ -43,14 +43,14 @@ public class TestTeraSort extends HadoopTestCase {
@After
public void tearDown() throws Exception {
- getFileSystem().delete(new Path(TEST_DIR), true);
+ getFileSystem().delete(TEST_DIR, true);
super.tearDown();
}
// Input/Output paths for sort
- private static final String TEST_DIR =
- new File(System.getProperty("test.build.data", "/tmp"), "terasort")
- .getAbsolutePath();
+ private static final Path TEST_DIR = new Path(new File(
+ System.getProperty("test.build.data", "/tmp"), "terasort")
+ .getAbsoluteFile().toURI().toString());
private static final Path SORT_INPUT_PATH = new Path(TEST_DIR, "sortin");
private static final Path SORT_OUTPUT_PATH = new Path(TEST_DIR, "sortout");
private static final Path TERA_OUTPUT_PATH = new Path(TEST_DIR, "validate");
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org