This is an automated email from the ASF dual-hosted git repository. xiangying pushed a commit to branch xiangying/test/2.10.4.4 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 973285f2c866f9d3904f2bd3ebabd1bba09dd7f1 Author: xiangying <[email protected]> AuthorDate: Thu Jun 29 18:10:07 2023 +0800 fix test --- .../java/org/apache/pulsar/broker/admin/AdminApi2Test.java | 8 +++++++- .../java/org/apache/pulsar/broker/service/ReplicatorTest.java | 10 ++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) 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 a928101c460..a9d6980a25c 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 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest { 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 158d223336b..9d4a48d5225 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 @@ public class ReplicatorTest extends ReplicatorTestBase { 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));
