fix test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index a928101..a9d6980 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -1476,7 +1476,13 @@
admin.topics().deletePartitionedTopic(topic);
// delete namespace
- admin.namespaces().deleteNamespace(namespace, false);
+ Awaitility.await().untilAsserted(() -> {
+ try {
+ admin.namespaces().deleteNamespace(namespace, false);
+ }catch (Exception e) {
+ Assert.fail();
+ }
+ });
assertFalse(admin.namespaces().getNamespaces(tenant).contains(namespace));
assertTrue(admin.namespaces().getNamespaces(tenant).isEmpty());
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 158d223..9d4a48d 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
@@ -1653,12 +1653,14 @@
MessageIdImpl lastMessageId = (MessageIdImpl) topic.getLastMessageId().get();
Position lastPosition = PositionImpl.get(lastMessageId.getLedgerId(), lastMessageId.getEntryId());
ConcurrentOpenHashMap<String, Replicator> replicators = topic.getReplicators();
- PersistentReplicator replicator = (PersistentReplicator) replicators.get("r2");
Awaitility.await().pollInterval(1, TimeUnit.SECONDS).timeout(30, TimeUnit.SECONDS)
- .untilAsserted(() -> assertEquals(org.apache.pulsar.broker.service.AbstractReplicator.State.Started,
- replicator.getState()));
- assertEquals(replicator.getState(), org.apache.pulsar.broker.service.AbstractReplicator.State.Started);
+ .untilAsserted(() -> {
+ PersistentReplicator replicator = (PersistentReplicator) replicators.get("r2");
+ assertNotNull(replicator);
+ assertEquals(org.apache.pulsar.broker.service.AbstractReplicator.State.Started,
+ replicator.getState());
+ });
// Make sure all the data has replicated to the remote cluster before close the cursor.
Awaitility.await().untilAsserted(() -> assertEquals(cursor.getMarkDeletedPosition(), lastPosition));
