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 aj...@apache.org on 2019/03/13 19:01:13 UTC
[hadoop] branch trunk updated: HDDS-1254. Fix failure in
TestOzoneManagerHttpServer & TestStorageContainerManagerHttpServer.
Contributed by Ajay Kumar. (#598)
This is an automated email from the ASF dual-hosted git repository.
ajay pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 4fa0099 HDDS-1254. Fix failure in TestOzoneManagerHttpServer & TestStorageContainerManagerHttpServer. Contributed by Ajay Kumar. (#598)
4fa0099 is described below
commit 4fa009989bd641388aeb9b1bd9c90e9ddbfe84c0
Author: Ajay Yadav <78...@users.noreply.github.com>
AuthorDate: Wed Mar 13 12:01:08 2019 -0700
HDDS-1254. Fix failure in TestOzoneManagerHttpServer & TestStorageContainerManagerHttpServer. Contributed by Ajay Kumar. (#598)
---
.../hdds/scm/TestStorageContainerManagerHttpServer.java | 10 ++++++----
.../apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java | 11 ++++++-----
2 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
index 46a6a9d..d9407e7 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/TestStorageContainerManagerHttpServer.java
@@ -106,13 +106,15 @@ public class TestStorageContainerManagerHttpServer {
Assert.assertTrue(implies(policy.isHttpEnabled(),
canAccess("http", server.getHttpAddress())));
- Assert.assertTrue(
- implies(!policy.isHttpEnabled(), server.getHttpAddress() == null));
+ Assert.assertTrue(implies(policy.isHttpEnabled() &&
+ !policy.isHttpsEnabled(),
+ !canAccess("https", server.getHttpsAddress())));
Assert.assertTrue(implies(policy.isHttpsEnabled(),
canAccess("https", server.getHttpsAddress())));
- Assert.assertTrue(
- implies(!policy.isHttpsEnabled(), server.getHttpsAddress() == null));
+ Assert.assertTrue(implies(policy.isHttpsEnabled() &&
+ !policy.isHttpEnabled(),
+ !canAccess("http", server.getHttpAddress())));
} finally {
if (server != null) {
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
index 3e11a13..fc85d8e 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHttpServer.java
@@ -95,8 +95,8 @@ public class TestOzoneManagerHttpServer {
@Test public void testHttpPolicy() throws Exception {
conf.set(DFSConfigKeys.DFS_HTTP_POLICY_KEY, policy.name());
conf.set(ScmConfigKeys.OZONE_SCM_HTTPS_ADDRESS_KEY, "localhost:0");
-
InetSocketAddress addr = InetSocketAddress.createUnresolved("localhost", 0);
+
OzoneManagerHttpServer server = null;
try {
server = new OzoneManagerHttpServer(conf, null);
@@ -104,13 +104,14 @@ public class TestOzoneManagerHttpServer {
Assert.assertTrue(implies(policy.isHttpEnabled(),
canAccess("http", server.getHttpAddress())));
- Assert.assertTrue(
- implies(!policy.isHttpEnabled(), server.getHttpAddress() == null));
+ Assert.assertTrue(implies(policy.isHttpEnabled() &&
+ !policy.isHttpsEnabled(),
+ !canAccess("https", server.getHttpsAddress())));
Assert.assertTrue(implies(policy.isHttpsEnabled(),
canAccess("https", server.getHttpsAddress())));
- Assert.assertTrue(
- implies(!policy.isHttpsEnabled(), server.getHttpsAddress() == null));
+ Assert.assertTrue(implies(policy.isHttpsEnabled(),
+ !canAccess("http", server.getHttpsAddress())));
} finally {
if (server != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org