hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject [1/2] hadoop git commit: HADOOP-12407. Test failing: hadoop.ipc.TestSaslRPC. (stevel)
Date Sat, 12 Sep 2015 17:57:02 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 c4128165b -> c8fe31e03
  refs/heads/trunk 4992f075c -> 3f685cd57


HADOOP-12407. Test failing: hadoop.ipc.TestSaslRPC. (stevel)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c8fe31e0
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c8fe31e0
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c8fe31e0

Branch: refs/heads/branch-2
Commit: c8fe31e03af0f2f3c4c1ed9a19ff55849355a11a
Parents: c412816
Author: Steve Loughran <stevel@apache.org>
Authored: Sat Sep 12 18:55:42 2015 +0100
Committer: Steve Loughran <stevel@apache.org>
Committed: Sat Sep 12 18:55:42 2015 +0100

----------------------------------------------------------------------
 hadoop-common-project/hadoop-common/CHANGES.txt             | 2 ++
 .../src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java    | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/c8fe31e0/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 3789f54..0136ad4 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -606,6 +606,8 @@ Release 2.8.0 - UNRELEASED
     HADOOP-12388. Fix components' version information in the web page
     'About the Cluster'. (Jun Gong via zxu)
 
+    HADOOP-12407. Test failing: hadoop.ipc.TestSaslRPC. (stevel)
+
 Release 2.7.2 - UNRELEASED
 
   INCOMPATIBLE CHANGES

http://git-wip-us.apache.org/repos/asf/hadoop/blob/c8fe31e0/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
index f6ab380..754b811 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/ipc/TestSaslRPC.java
@@ -558,9 +558,16 @@ public class TestSaslRPC {
       e = se;
     }
     assertNotNull(e);
-    assertEquals("PLAIN auth failed: wrong password", e.getMessage());
+    String message = e.getMessage();
+    assertContains("PLAIN auth failed", message);
+    assertContains("wrong password", message);
   }
 
+  private void assertContains(String expected, String text) {
+    assertNotNull("null text", text );
+    assertTrue("No {" + expected + "} in {" + text + "}",
+        text.contains(expected));
+  }
 
   private void runNegotiation(CallbackHandler clientCbh,
                               CallbackHandler serverCbh)


Mime
View raw message