Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 64963200AED for ; Wed, 4 May 2016 00:05:55 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 633141609F7; Wed, 4 May 2016 00:05:55 +0200 (CEST) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A09E61609F6 for ; Wed, 4 May 2016 00:05:54 +0200 (CEST) Received: (qmail 38697 invoked by uid 500); 3 May 2016 22:05:49 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 37293 invoked by uid 99); 3 May 2016 22:05:48 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 May 2016 22:05:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C1C91E93DF; Tue, 3 May 2016 22:05:48 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Date: Tue, 03 May 2016 22:06:24 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [37/50] hadoop git commit: MAPREDUCE-6672. TestTeraSort fails on Windows. Contributed by Tibor Kiss. archived-at: Tue, 03 May 2016 22:05:55 -0000 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 Authored: Fri Apr 29 11:33:32 2016 -0700 Committer: Chris Nauroth 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