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 in...@apache.org on 2018/05/16 16:34:28 UTC
[1/5] hadoop git commit: HDFS-13557. TestDFSAdmin#testListOpenFiles
fails on Windows. Contributed by Anbang Hu.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 19cf70671 -> d163f7231
refs/heads/branch-2.9 67927322d -> 56a8ee6b2
refs/heads/branch-3.0 eadfb5519 -> 0a2cdd273
refs/heads/branch-3.1 79b2a508e -> 5310542fb
refs/heads/trunk d47c09dcb -> 6b67161ca
HDFS-13557. TestDFSAdmin#testListOpenFiles fails on Windows. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/6b67161c
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/6b67161c
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/6b67161c
Branch: refs/heads/trunk
Commit: 6b67161ca33881d5f3d7606a57786e9c960759a1
Parents: d47c09d
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 09:31:46 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 09:31:46 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/6b67161c/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 3ac627f..aab3aee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -813,12 +813,14 @@ public class TestDFSAdmin {
if (closedFileSet != null) {
for (Path closedFilePath : closedFileSet) {
assertThat(outStr,
- not(containsString(closedFilePath.toString() + "\n")));
+ not(containsString(closedFilePath.toString() +
+ System.lineSeparator())));
}
}
for (Path openFilePath : openFilesMap.keySet()) {
- assertThat(outStr, is(containsString(openFilePath.toString() + "\n")));
+ assertThat(outStr, is(containsString(openFilePath.toString() +
+ System.lineSeparator())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[3/5] hadoop git commit: HDFS-13557. TestDFSAdmin#testListOpenFiles
fails on Windows. Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13557. TestDFSAdmin#testListOpenFiles fails on Windows. Contributed by Anbang Hu.
(cherry picked from commit 6b67161ca33881d5f3d7606a57786e9c960759a1)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0a2cdd27
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0a2cdd27
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0a2cdd27
Branch: refs/heads/branch-3.0
Commit: 0a2cdd2730d83cb8263b21f0b96667717ddecd6c
Parents: eadfb55
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 09:31:46 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 09:32:39 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/0a2cdd27/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 7237c88..d96e306 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -796,12 +796,14 @@ public class TestDFSAdmin {
if (closedFileSet != null) {
for (Path closedFilePath : closedFileSet) {
assertThat(outStr,
- not(containsString(closedFilePath.toString() + "\n")));
+ not(containsString(closedFilePath.toString() +
+ System.lineSeparator())));
}
}
for (Path openFilePath : openFilesMap.keySet()) {
- assertThat(outStr, is(containsString(openFilePath.toString() + "\n")));
+ assertThat(outStr, is(containsString(openFilePath.toString() +
+ System.lineSeparator())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[4/5] hadoop git commit: HDFS-13557. TestDFSAdmin#testListOpenFiles
fails on Windows. Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13557. TestDFSAdmin#testListOpenFiles fails on Windows. Contributed by Anbang Hu.
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/d163f723
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/d163f723
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/d163f723
Branch: refs/heads/branch-2
Commit: d163f723103143d68cebc000b88c5e3e3cfc0d1e
Parents: 19cf706
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 09:33:16 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 09:33:16 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/d163f723/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 8b46ac7..58ad52c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -658,10 +658,12 @@ public class TestDFSAdmin {
final String outStr = scanIntoString(out);
LOG.info("dfsadmin -listOpenFiles output: \n" + out);
for (Path closedFilePath : closedFileSet) {
- assertThat(outStr, not(containsString(closedFilePath.toString() + "\n")));
+ assertThat(outStr, not(containsString(closedFilePath.toString() +
+ System.lineSeparator())));
}
for (Path openFilePath : openFilesMap.keySet()) {
- assertThat(outStr, is(containsString(openFilePath.toString() + "\n")));
+ assertThat(outStr, is(containsString(openFilePath.toString() +
+ System.lineSeparator())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[5/5] hadoop git commit: HDFS-13557. TestDFSAdmin#testListOpenFiles
fails on Windows. Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13557. TestDFSAdmin#testListOpenFiles fails on Windows. Contributed by Anbang Hu.
(cherry picked from commit d163f723103143d68cebc000b88c5e3e3cfc0d1e)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/56a8ee6b
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/56a8ee6b
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/56a8ee6b
Branch: refs/heads/branch-2.9
Commit: 56a8ee6b2c54c4ff5242704622af1db86a27ab64
Parents: 6792732
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 09:33:16 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 09:33:46 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/56a8ee6b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 8b46ac7..58ad52c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -658,10 +658,12 @@ public class TestDFSAdmin {
final String outStr = scanIntoString(out);
LOG.info("dfsadmin -listOpenFiles output: \n" + out);
for (Path closedFilePath : closedFileSet) {
- assertThat(outStr, not(containsString(closedFilePath.toString() + "\n")));
+ assertThat(outStr, not(containsString(closedFilePath.toString() +
+ System.lineSeparator())));
}
for (Path openFilePath : openFilesMap.keySet()) {
- assertThat(outStr, is(containsString(openFilePath.toString() + "\n")));
+ assertThat(outStr, is(containsString(openFilePath.toString() +
+ System.lineSeparator())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org
[2/5] hadoop git commit: HDFS-13557. TestDFSAdmin#testListOpenFiles
fails on Windows. Contributed by Anbang Hu.
Posted by in...@apache.org.
HDFS-13557. TestDFSAdmin#testListOpenFiles fails on Windows. Contributed by Anbang Hu.
(cherry picked from commit 6b67161ca33881d5f3d7606a57786e9c960759a1)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5310542f
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5310542f
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5310542f
Branch: refs/heads/branch-3.1
Commit: 5310542fb43044c2d8946ad5ab088e7b20390309
Parents: 79b2a50
Author: Inigo Goiri <in...@apache.org>
Authored: Wed May 16 09:31:46 2018 -0700
Committer: Inigo Goiri <in...@apache.org>
Committed: Wed May 16 09:32:15 2018 -0700
----------------------------------------------------------------------
.../test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/5310542f/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
----------------------------------------------------------------------
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
index 3ac627f..aab3aee 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/tools/TestDFSAdmin.java
@@ -813,12 +813,14 @@ public class TestDFSAdmin {
if (closedFileSet != null) {
for (Path closedFilePath : closedFileSet) {
assertThat(outStr,
- not(containsString(closedFilePath.toString() + "\n")));
+ not(containsString(closedFilePath.toString() +
+ System.lineSeparator())));
}
}
for (Path openFilePath : openFilesMap.keySet()) {
- assertThat(outStr, is(containsString(openFilePath.toString() + "\n")));
+ assertThat(outStr, is(containsString(openFilePath.toString() +
+ System.lineSeparator())));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org