You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by mm...@apache.org on 2019/05/31 20:29:06 UTC
[pulsar] branch master updated: Increase timeout for replicator
tests setup (#4428)
This is an automated email from the ASF dual-hosted git repository.
mmerli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new cff5627 Increase timeout for replicator tests setup (#4428)
cff5627 is described below
commit cff5627b4d691f81aa0d1ddcb80037ee6a747fe0
Author: Matteo Merli <mm...@apache.org>
AuthorDate: Fri May 31 13:28:57 2019 -0700
Increase timeout for replicator tests setup (#4428)
---
.../org/apache/pulsar/broker/service/PeerReplicatorTest.java | 10 +++++-----
.../apache/pulsar/broker/service/ReplicatorGlobalNSTest.java | 6 +++---
.../pulsar/broker/service/ReplicatorRateLimiterTest.java | 4 ++--
.../java/org/apache/pulsar/broker/service/ReplicatorTest.java | 4 ++--
.../org/apache/pulsar/broker/service/ReplicatorTlsTest.java | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
index 3c0152b..c0e597e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PeerReplicatorTest.java
@@ -47,13 +47,13 @@ import com.google.common.collect.Sets;
public class PeerReplicatorTest extends ReplicatorTestBase {
@Override
- @BeforeClass
+ @BeforeClass(timeOut = 300000)
void setup() throws Exception {
super.setup();
}
@Override
- @AfterClass
+ @AfterClass(timeOut = 300000)
void shutdown() throws Exception {
super.shutdown();
}
@@ -178,11 +178,11 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
}, 5, 100);
assertEquals(admin1.clusters().getPeerClusterNames(mainClusterName), peerClusters);
}
-
+
/**
* Removing local cluster from the replication-cluster should make sure that bundle should not be loaded by the
* cluster even if owner broker doesn't receive the watch to avoid lookup-conflict between peer-cluster.
- *
+ *
* @throws Exception
*/
@Test(timeOut = 10000)
@@ -192,7 +192,7 @@ public class PeerReplicatorTest extends ReplicatorTestBase {
admin1.clusters().updatePeerClusterNames("r1", null);
admin1.clusters().updatePeerClusterNames("r2", null);
admin1.clusters().updatePeerClusterNames("r3", null);
-
+
final String serviceUrl = pulsar3.getBrokerServiceUrl();
final String namespace1 = "pulsar/global/peer-change-repl-ns";
admin1.namespaces().createNamespace(namespace1);
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
index cc53831..da48dd9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorGlobalNSTest.java
@@ -45,13 +45,13 @@ public class ReplicatorGlobalNSTest extends ReplicatorTestBase {
}
@Override
- @BeforeClass(timeOut = 60000)
+ @BeforeClass(timeOut = 300000)
void setup() throws Exception {
super.setup();
}
@Override
- @AfterClass(timeOut = 60000)
+ @AfterClass(timeOut = 300000)
void shutdown() throws Exception {
super.shutdown();
}
@@ -59,7 +59,7 @@ public class ReplicatorGlobalNSTest extends ReplicatorTestBase {
/**
* If local cluster is removed from the global namespace then all topics under that namespace should be deleted from
* the cluster.
- *
+ *
* @throws Exception
*/
@Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java
index 4631b07..dba37ac 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorRateLimiterTest.java
@@ -54,13 +54,13 @@ public class ReplicatorRateLimiterTest extends ReplicatorTestBase {
}
@Override
- @BeforeClass(timeOut = 30000)
+ @BeforeClass(timeOut = 300000)
void setup() throws Exception {
super.setup();
}
@Override
- @AfterClass(timeOut = 30000)
+ @AfterClass(timeOut = 300000)
void shutdown() throws Exception {
super.shutdown();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
index 3150983..91d4ee7 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTest.java
@@ -99,13 +99,13 @@ public class ReplicatorTest extends ReplicatorTestBase {
}
@Override
- @BeforeClass(timeOut = 30000)
+ @BeforeClass(timeOut = 300000)
void setup() throws Exception {
super.setup();
}
@Override
- @AfterClass(timeOut = 30000)
+ @AfterClass(timeOut = 300000)
void shutdown() throws Exception {
super.shutdown();
}
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
index f9d3153..3ad22e9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ReplicatorTlsTest.java
@@ -33,7 +33,7 @@ import org.testng.collections.Lists;
public class ReplicatorTlsTest extends ReplicatorTestBase {
@Override
- @BeforeClass
+ @BeforeClass(timeOut = 300000)
void setup() throws Exception {
config1.setBrokerClientTlsEnabled(true);
config2.setBrokerClientTlsEnabled(true);
@@ -42,7 +42,7 @@ public class ReplicatorTlsTest extends ReplicatorTestBase {
}
@Override
- @AfterClass
+ @AfterClass(timeOut = 300000)
void shutdown() throws Exception {
super.shutdown();
}