fix test

apache · Jan 31, 2024 · e1e43be · e1e43be
1 parent cd50855
commit e1e43be
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 9 deletions.
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/TopicEventsListenerTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/TopicEventsListenerTest.java
@@ -278,11 +278,19 @@ private void createTopicAndVerifyEvents(String topicTypePartitioned, String topi
 
         } else {
             topicNameToWatch = topicName;
-            admin.topics().createNonPartitionedTopic(topicName);
+            try {
+                admin.topics().createNonPartitionedTopic(topicName);
+            }catch (Exception ex) {
+
+            }
 
             expectedEvents = new String[]{
-                    "LOAD__BEFORE",
-                    "LOAD__FAILURE",
+                    // Before https://github.com/apache/pulsar/pull/21995, Pulsar will skip create topic if the topic
+                    //   was already exists, and the action "check topic exists" will try to load Managed ledger,
+                    //   the check triggers two exrtra events: [LOAD__BEFORE, LOAD__FAILURE].
+                    //   #21995 fixed this wrong behavior, so remove these two events.
+                    // "LOAD__BEFORE",
+                    // "LOAD__FAILURE",
                     "LOAD__BEFORE",
                     "CREATE__BEFORE",
                     "CREATE__SUCCESS",

diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicAutoCreationTest.java
@@ -149,21 +149,23 @@ public void testPartitionedTopicAutoCreationForbiddenDuringNamespaceDeletion()
                     .sendTimeout(1, TimeUnit.SECONDS)
                     .topic(topic)
                     .create()) {
-            } catch (PulsarClientException.LookupException expected) {
-                String msg = "Namespace bundle for topic (%s) not served by this instance";
+            } catch (PulsarClientException.TopicDoesNotExistException expected) {
+                // Since the "policies.deleted" is "true", the value of "isAllowAutoTopicCreationAsync" will be false,
+                // so the "TopicDoesNotExistException" is expected.
                 log.info("Expected error", expected);
-                assertTrue(expected.getMessage().contains(String.format(msg, topic))
+                assertTrue(expected.getMessage().contains(topic)
                         || expected.getMessage().contains(topicPoliciesServiceInitException));
             }
 
             try (Consumer<byte[]> ignored = pulsarClient.newConsumer()
                     .topic(topic)
                     .subscriptionName("test")
                     .subscribe()) {
-            } catch (PulsarClientException.LookupException expected) {
-                String msg = "Namespace bundle for topic (%s) not served by this instance";
+            } catch (PulsarClientException.TopicDoesNotExistException expected) {
+                // Since the "policies.deleted" is "true", the value of "isAllowAutoTopicCreationAsync" will be false,
+                // so the "TopicDoesNotExistException" is expected.
                 log.info("Expected error", expected);
-                assertTrue(expected.getMessage().contains(String.format(msg, topic))
+                assertTrue(expected.getMessage().contains(topic)
                         || expected.getMessage().contains(topicPoliciesServiceInitException));
             }