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 aa...@apache.org on 2021/12/17 16:25:11 UTC

[hadoop] branch branch-2.10 updated: HADOOP-15293. TestLogLevel fails on Java 9

This is an automated email from the ASF dual-hosted git repository.

aajisaka pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/hadoop.git


The following commit(s) were added to refs/heads/branch-2.10 by this push:
     new cc84223  HADOOP-15293. TestLogLevel fails on Java 9
cc84223 is described below

commit cc842231dfcdbf2626594179da3ec3b363d53d78
Author: Takanobu Asanuma <ta...@yahoo-corp.jp>
AuthorDate: Fri Mar 9 10:20:35 2018 -0800

    HADOOP-15293. TestLogLevel fails on Java 9
    
    Signed-off-by: Akira Ajisaka <aa...@apache.org>
    (cherry picked from commit 99ab511cbac570bea9d31a55898b95590a8e3159)
    
     Conflicts:
    	hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
---
 .../src/test/java/org/apache/hadoop/log/TestLogLevel.java             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
index 30bf726..b29c7ce 100644
--- a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
+++ b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogLevel.java
@@ -356,7 +356,7 @@ public class TestLogLevel extends KerberosSecurityTestcase {
       fail("A HTTPS Client should not have succeeded in connecting to a " +
           "HTTP server");
     } catch (SSLException e) {
-      GenericTestUtils.assertExceptionContains("Unrecognized SSL message", e);
+      GenericTestUtils.assertExceptionContains("recognized SSL message", e);
     }
   }
 
@@ -374,7 +374,7 @@ public class TestLogLevel extends KerberosSecurityTestcase {
       fail("A HTTPS Client should not have succeeded in connecting to a " +
           "HTTP server");
     } catch (SSLException e) {
-      GenericTestUtils.assertExceptionContains("Unrecognized SSL message", e);
+      GenericTestUtils.assertExceptionContains("recognized SSL message", e);
     }
   }
 

---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org