This is an automated email from the ASF dual-hosted git repository. yubiao pushed a commit to branch branch-2.9 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit 0a23188c62896ab61fc5695f670aa2b89e99d2a4 Author: fengyubiao <[email protected]> AuthorDate: Mon Mar 27 18:59:52 2023 +0800 Revert "[fix] [admin] Make response code to 400 instead of 500 when delete topic fails due to enabled geo-replication (#19879)" This reverts commit a24659a7ded645692ba1bb4ded7c3a185b4790b4. --- .../pulsar/broker/service/ReplicatorTest.java | 30 +--------------------- 1 file changed, 1 insertion(+), 29 deletions(-) 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 e03a0c1acb9..90ecff200f7 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 @@ -64,7 +64,6 @@ import org.apache.pulsar.broker.service.BrokerServiceException.NamingException; import org.apache.pulsar.broker.service.persistent.PersistentReplicator; import org.apache.pulsar.broker.service.persistent.PersistentTopic; import org.apache.pulsar.client.admin.PulsarAdmin; -import org.apache.pulsar.client.admin.PulsarAdminException; import org.apache.pulsar.client.api.Consumer; import org.apache.pulsar.client.api.Message; import org.apache.pulsar.client.api.MessageId; @@ -861,34 +860,7 @@ public class ReplicatorTest extends ReplicatorTestBase { assertNull(producer); } - @Test - public void testDeleteTopicFailure() throws Exception { - final String topicName = BrokerTestUtil.newUniqueName("persistent://pulsar/ns/tp_" + UUID.randomUUID()); - admin1.topics().createNonPartitionedTopic(topicName); - try { - admin1.topics().delete(topicName); - fail("Delete topic should fail if enabled replicator"); - } catch (Exception ex) { - assertTrue(ex instanceof PulsarAdminException); - assertEquals(((PulsarAdminException) ex).getStatusCode(), 422/* Unprocessable entity*/); - } - } - - @Test - public void testDeletePartitionedTopicFailure() throws Exception { - final String topicName = BrokerTestUtil.newUniqueName("persistent://pulsar/ns/tp_" + UUID.randomUUID()); - admin1.topics().createPartitionedTopic(topicName, 2); - admin1.topics().createSubscription(topicName, "sub1", MessageId.earliest); - try { - admin1.topics().deletePartitionedTopic(topicName); - fail("Delete topic should fail if enabled replicator"); - } catch (Exception ex) { - assertTrue(ex instanceof PulsarAdminException); - assertEquals(((PulsarAdminException) ex).getStatusCode(), 422/* Unprocessable entity*/); - } - } - - @Test(priority = 4, timeOut = 30000) + @Test(priority = 5, timeOut = 30000) public void testReplicatorProducerName() throws Exception { log.info("--- Starting ReplicatorTest::testReplicatorProducerName ---"); final String topicName = BrokerTestUtil.newUniqueName("persistent://pulsar/ns/testReplicatorProducerName");
