This is an automated email from the ASF dual-hosted git repository. rdhabalia pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git
The following commit(s) were added to refs/heads/master by this push: new 72432ce Advertise localhost address for unit test (#1105) 72432ce is described below commit 72432ce7bb6ebbccb104147f3110a14f51c0a04c Author: Rajan Dhabalia <rdhaba...@apache.org> AuthorDate: Wed Jan 24 21:00:54 2018 -0800 Advertise localhost address for unit test (#1105) * Advertise localhost address for unit test * fix test --- .../src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java | 1 + .../org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java | 1 + .../java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java | 1 + .../org/apache/pulsar/broker/service/AdvertisedAddressTest.java | 1 + .../org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java | 1 + .../org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java | 1 + .../java/org/apache/pulsar/broker/service/ReplicatorTestBase.java | 3 +++ .../src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java | 1 + .../java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java | 6 ++++++ .../java/org/apache/pulsar/client/api/NonPersistentTopicTest.java | 3 +++ 10 files changed, 19 insertions(+) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java index 73071ff..8e7db9d 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/SLAMonitoringTest.java @@ -88,6 +88,7 @@ public class SLAMonitoringTest { ServiceConfiguration config = new ServiceConfiguration(); config.setBrokerServicePort(brokerNativeBrokerPorts[i]); config.setClusterName("my-cluster"); + config.setAdvertisedAddress("localhost"); config.setWebServicePort(brokerWebServicePorts[i]); config.setZookeeperServers("127.0.0.1" + ":" + ZOOKEEPER_PORT); config.setBrokerServicePort(brokerNativeBrokerPorts[i]); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java index 57ed5e5..c23d726 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java @@ -89,6 +89,7 @@ public abstract class MockedPulsarServiceBaseTest { this.conf = new ServiceConfiguration(); this.conf.setBrokerServicePort(BROKER_PORT); this.conf.setBrokerServicePortTls(BROKER_PORT_TLS); + this.conf.setAdvertisedAddress("localhost"); this.conf.setWebServicePort(BROKER_WEBSERVICE_PORT); this.conf.setWebServicePortTls(BROKER_WEBSERVICE_PORT_TLS); this.conf.setClusterName(configClusterName); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java index 8511e40..80ca562 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/loadbalance/LoadBalancerTest.java @@ -137,6 +137,7 @@ public class LoadBalancerTest { ServiceConfiguration config = new ServiceConfiguration(); config.setBrokerServicePort(brokerNativeBrokerPorts[i]); config.setClusterName("use"); + config.setAdvertisedAddress("localhost"); config.setWebServicePort(brokerWebServicePorts[i]); config.setZookeeperServers("127.0.0.1" + ":" + ZOOKEEPER_PORT); config.setBrokerServicePort(brokerNativeBrokerPorts[i]); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java index 266354f..dda76b1 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/AdvertisedAddressTest.java @@ -50,6 +50,7 @@ public class AdvertisedAddressTest { config.setZookeeperServers("127.0.0.1" + ":" + ZOOKEEPER_PORT); config.setWebServicePort(BROKER_WEBSERVICE_PORT); config.setClusterName("usc"); + config.setAdvertisedAddress("localhost"); config.setBrokerServicePort(BROKER_SERVICE_PORT); config.setAdvertisedAddress(advertisedAddress); config.setManagedLedgerMaxEntriesPerLedger(5); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java index 286a700..f1761d8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BacklogQuotaManagerTest.java @@ -80,6 +80,7 @@ public class BacklogQuotaManagerTest { // start pulsar service config = new ServiceConfiguration(); config.setZookeeperServers("127.0.0.1" + ":" + ZOOKEEPER_PORT); + config.setAdvertisedAddress("localhost"); config.setWebServicePort(BROKER_WEBSERVICE_PORT); config.setClusterName("usc"); config.setBrokerServicePort(BROKER_SERVICE_PORT); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java index 38afc78..f5711eb 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BrokerBkEnsemblesTests.java @@ -87,6 +87,7 @@ public class BrokerBkEnsemblesTests { // start pulsar service config = new ServiceConfiguration(); config.setZookeeperServers("127.0.0.1" + ":" + ZOOKEEPER_PORT); + config.setAdvertisedAddress("localhost"); config.setWebServicePort(BROKER_WEBSERVICE_PORT); config.setClusterName("usc"); config.setBrokerServicePort(BROKER_SERVICE_PORT); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java index e487f12..8b2c474 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTestBase.java @@ -117,6 +117,7 @@ public class ReplicatorTestBase { // completely // independent config objects instead of referring to the same properties object config1.setClusterName("r1"); + config1.setAdvertisedAddress("localhost"); config1.setWebServicePort(webServicePort1); config1.setWebServicePortTls(webServicePortTls1); config1.setZookeeperServers("127.0.0.1:" + zkPort1); @@ -149,6 +150,7 @@ public class ReplicatorTestBase { int webServicePort2 = PortManager.nextFreePort(); int webServicePortTls2 = PortManager.nextFreePort(); config2.setClusterName("r2"); + config2.setAdvertisedAddress("localhost"); config2.setWebServicePort(webServicePort2); config2.setWebServicePortTls(webServicePortTls2); config2.setZookeeperServers("127.0.0.1:" + zkPort2); @@ -181,6 +183,7 @@ public class ReplicatorTestBase { int webServicePort3 = PortManager.nextFreePort(); int webServicePortTls3 = PortManager.nextFreePort(); config3.setClusterName("r3"); + config3.setAdvertisedAddress("localhost"); config3.setWebServicePort(webServicePort3); config3.setWebServicePortTls(webServicePortTls3); config3.setZookeeperServers("127.0.0.1:" + zkPort3); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java index 04b26b3..41ab8bb 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/web/WebServiceTest.java @@ -241,6 +241,7 @@ public class WebServiceTest { roles.add("client"); ServiceConfiguration config = new ServiceConfiguration(); + config.setAdvertisedAddress("localhost"); config.setWebServicePort(BROKER_WEBSERVICE_PORT); config.setWebServicePortTls(BROKER_WEBSERVICE_PORT_TLS); config.setClientLibraryVersionCheckEnabled(enableFilter); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java index 0f7da87..e065305 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/BrokerServiceLookupTest.java @@ -144,6 +144,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { ServiceConfiguration conf2 = new ServiceConfiguration(); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); + conf2.setAdvertisedAddress("localhost"); conf2.setWebServicePort(PortManager.nextFreePort()); conf2.setWebServicePortTls(PortManager.nextFreePort()); conf2.setAdvertisedAddress("localhost"); @@ -222,6 +223,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { final String newCluster = "use2"; final String property = "my-property2"; ServiceConfiguration conf2 = new ServiceConfiguration(); + conf2.setAdvertisedAddress("localhost"); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); conf2.setWebServicePort(PortManager.nextFreePort()); @@ -315,6 +317,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { /**** start broker-2 ****/ ServiceConfiguration conf2 = new ServiceConfiguration(); + conf2.setAdvertisedAddress("localhost"); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); conf2.setWebServicePort(PortManager.nextFreePort()); @@ -390,6 +393,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { /**** start broker-2 ****/ ServiceConfiguration conf2 = new ServiceConfiguration(); + conf2.setAdvertisedAddress("localhost"); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); conf2.setWebServicePort(PortManager.nextFreePort()); @@ -796,6 +800,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { final String namespace = "my-property/use/my-ns"; // (1) Start broker-1 ServiceConfiguration conf2 = new ServiceConfiguration(); + conf2.setAdvertisedAddress("localhost"); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); conf2.setWebServicePort(PortManager.nextFreePort()); @@ -899,6 +904,7 @@ public class BrokerServiceLookupTest extends ProducerConsumerBase { final String namespace = "my-property/use/my-ns"; // (1) Start broker-1 ServiceConfiguration conf2 = new ServiceConfiguration(); + conf2.setAdvertisedAddress("localhost"); conf2.setBrokerServicePort(PortManager.nextFreePort()); conf2.setBrokerServicePortTls(PortManager.nextFreePort()); conf2.setWebServicePort(PortManager.nextFreePort()); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java index 0d1b8c3..9f551ed 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/NonPersistentTopicTest.java @@ -837,6 +837,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase { // independent config objects instead of referring to the same properties object ServiceConfiguration config1 = new ServiceConfiguration(); config1.setClusterName(configClusterName); + config1.setAdvertisedAddress("localhost"); config1.setWebServicePort(webServicePort1); config1.setZookeeperServers("127.0.0.1:" + zkPort1); config1.setGlobalZookeeperServers("127.0.0.1:" + globalZKPort + "/foo"); @@ -863,6 +864,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase { config2 = new ServiceConfiguration(); config2.setClusterName("r2"); config2.setWebServicePort(webServicePort2); + config2.setAdvertisedAddress("localhost"); config2.setZookeeperServers("127.0.0.1:" + zkPort2); config2.setGlobalZookeeperServers("127.0.0.1:" + globalZKPort + "/foo"); config2.setBrokerDeleteInactiveTopicsEnabled(isBrokerServicePurgeInactiveDestination()); @@ -888,6 +890,7 @@ public class NonPersistentTopicTest extends ProducerConsumerBase { config3 = new ServiceConfiguration(); config3.setClusterName("r3"); config3.setWebServicePort(webServicePort3); + config3.setAdvertisedAddress("localhost"); config3.setZookeeperServers("127.0.0.1:" + zkPort3); config3.setGlobalZookeeperServers("127.0.0.1:" + globalZKPort + "/foo"); config3.setBrokerDeleteInactiveTopicsEnabled(isBrokerServicePurgeInactiveDestination()); -- To stop receiving notification emails like this one, please contact rdhaba...@apache.org.