Repository: hadoop Updated Branches: refs/heads/branch-2 1d175f0f3 -> afac7a264
HADOOP-10068. Improve log4j regex in testFindContainingJar. Contributed by Robert Rati. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/afac7a26 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/afac7a26 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/afac7a26 Branch: refs/heads/branch-2 Commit: afac7a2640c34abf5b2794ea83e81b7fda085438 Parents: 1d175f0 Author: Haohui Mai <[email protected]> Authored: Sun Nov 22 18:29:03 2015 -0800 Committer: Haohui Mai <[email protected]> Committed: Sun Nov 22 18:29:10 2015 -0800 ---------------------------------------------------------------------- hadoop-common-project/hadoop-common/CHANGES.txt | 3 +++ .../src/test/java/org/apache/hadoop/util/TestClassUtil.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/afac7a26/hadoop-common-project/hadoop-common/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index e7b59be..6b56071 100644 --- a/hadoop-common-project/hadoop-common/CHANGES.txt +++ b/hadoop-common-project/hadoop-common/CHANGES.txt @@ -830,6 +830,9 @@ Release 2.8.0 - UNRELEASED HADOOP-12098. Remove redundant test dependencies in Hadoop Archives. (Varun Saxena via wheat9) + HADOOP-10068. Improve log4j regex in testFindContainingJar. + (Robert Rati via wheat9) + Release 2.7.3 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/afac7a26/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java ---------------------------------------------------------------------- diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java index 14e19f4..4bc36e2 100644 --- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java +++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/util/TestClassUtil.java @@ -32,9 +32,9 @@ public class TestClassUtil { Assert.assertNotNull("Containing jar not found for Logger", containingJar); File jarFile = new File(containingJar); - Assert.assertTrue("Containing jar does not exist on file system", + Assert.assertTrue("Containing jar does not exist on file system ", jarFile.exists()); - Assert.assertTrue("Incorrect jar file" + containingJar, - jarFile.getName().matches("log4j.+[.]jar")); + Assert.assertTrue("Incorrect jar file " + containingJar, + jarFile.getName().matches("log4j.*[.]jar")); } }
