From e54be6cdc32b173a3a41837c017dd156b3116c54 Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Thu, 27 Oct 2022 21:49:23 +0800 Subject: [PATCH 1/6] fix: fix for 873 --- pulsar/consumer_test.go | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index f574378374..d7e869a80e 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -1440,15 +1440,6 @@ func TestRLQMultiTopics(t *testing.T) { assert.Nil(t, err) defer rlqConsumer.Close() - // subscribe DLQ Topic - dlqConsumer, err := client.Subscribe(ConsumerOptions{ - Topic: subName + "-DLQ", - SubscriptionName: subName, - SubscriptionInitialPosition: SubscriptionPositionEarliest, - }) - assert.Nil(t, err) - defer dlqConsumer.Close() - // create multi producers producer01, err := client.CreateProducer(ProducerOptions{Topic: topic01}) assert.Nil(t, err) @@ -1483,6 +1474,15 @@ func TestRLQMultiTopics(t *testing.T) { assert.Error(t, err) assert.Nil(t, msg) + // subscribe DLQ Topic + dlqConsumer, err := client.Subscribe(ConsumerOptions{ + Topic: subName + "-DLQ", + SubscriptionName: subName, + SubscriptionInitialPosition: SubscriptionPositionEarliest, + }) + assert.Nil(t, err) + defer dlqConsumer.Close() + // 3. Create consumer on the DLQ topic to verify the routing dlqReceived := 0 for dlqReceived < 2*N { From 84f581dbdd0101d0e2c675e05b5b9f25de10e50f Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Thu, 27 Oct 2022 22:05:31 +0800 Subject: [PATCH 2/6] fix: fix for 873 --- pulsar/consumer_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index d7e869a80e..7a8c9608eb 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -1421,7 +1421,8 @@ func TestRLQMultiTopics(t *testing.T) { subName := fmt.Sprintf("sub01-%d", time.Now().Unix()) maxRedeliveries := 2 N := 100 - ctx := context.Background() + ctx, cancel := context.WithTimeout(context.Background(), time.Second*30) + defer cancel() client, err := NewClient(ClientOptions{URL: lookupURL}) assert.Nil(t, err) From 0e8f9db3ae70848ea315a261611a7bd1caee2159 Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Fri, 28 Oct 2022 09:39:01 +0800 Subject: [PATCH 3/6] fix: restart CI --- pulsar/consumer_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index 7a8c9608eb..be583302b3 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -1481,6 +1481,7 @@ func TestRLQMultiTopics(t *testing.T) { SubscriptionName: subName, SubscriptionInitialPosition: SubscriptionPositionEarliest, }) + assert.Nil(t, err) defer dlqConsumer.Close() From 3a57ec27e287ccd03cd8ddfa010453a4f74c955f Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Fri, 28 Oct 2022 10:40:15 +0800 Subject: [PATCH 4/6] fix: fix TestRLQSpecifiedPartitionTopic --- pulsar/consumer_test.go | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index be583302b3..89d7d2ce5f 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -1549,15 +1549,6 @@ func TestRLQSpecifiedPartitionTopic(t *testing.T) { assert.Nil(t, err) defer rlqConsumer.Close() - // subscribe DLQ Topic - dlqConsumer, err := client.Subscribe(ConsumerOptions{ - Topic: subName + "-DLQ", - SubscriptionName: subName, - SubscriptionInitialPosition: SubscriptionPositionEarliest, - }) - assert.Nil(t, err) - defer dlqConsumer.Close() - // create producer producer, err := client.CreateProducer(ProducerOptions{Topic: normalTopic}) assert.Nil(t, err) @@ -1586,6 +1577,15 @@ func TestRLQSpecifiedPartitionTopic(t *testing.T) { assert.Error(t, err) assert.Nil(t, msg) + // subscribe DLQ Topic + dlqConsumer, err := client.Subscribe(ConsumerOptions{ + Topic: subName + "-DLQ", + SubscriptionName: subName, + SubscriptionInitialPosition: SubscriptionPositionEarliest, + }) + assert.Nil(t, err) + defer dlqConsumer.Close() + // 3. Create consumer on the DLQ topic to verify the routing dlqReceived := 0 for dlqReceived < N { @@ -3264,3 +3264,9 @@ func TestAvailablePermitsLeak(t *testing.T) { assert.NotEqual(t, true, errors.Is(err, context.DeadlineExceeded), "This means the resource is exhausted. consumer.Receive() will block forever.") } + +func TestCI(t *testing.T) { + for i := 0; i < 50; i++ { + TestAvailablePermitsLeak(t) + } +} From dca81593f9a3121353f0b6d077f3b7b16fb1c740 Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Fri, 28 Oct 2022 15:14:13 +0800 Subject: [PATCH 5/6] test: restart CI --- pulsar/consumer_test.go | 1 - 1 file changed, 1 deletion(-) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index 89d7d2ce5f..49af16f0e4 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -1481,7 +1481,6 @@ func TestRLQMultiTopics(t *testing.T) { SubscriptionName: subName, SubscriptionInitialPosition: SubscriptionPositionEarliest, }) - assert.Nil(t, err) defer dlqConsumer.Close() From dedf6a148b6e30994054f6d1dff42f7766e1241f Mon Sep 17 00:00:00 2001 From: Jiaqi Shen <18863662628@163.com> Date: Fri, 28 Oct 2022 15:49:16 +0800 Subject: [PATCH 6/6] fix: remove redundant --- pulsar/consumer_test.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pulsar/consumer_test.go b/pulsar/consumer_test.go index 49af16f0e4..139d814414 100644 --- a/pulsar/consumer_test.go +++ b/pulsar/consumer_test.go @@ -41,7 +41,7 @@ import ( var ( adminURL = "http://localhost:8080" - lookupURL = "pulsar://localhost:6650" + lookupURL = "pulsar://10.105.7.225:6650" ) func TestProducerConsumer(t *testing.T) { @@ -3263,9 +3263,3 @@ func TestAvailablePermitsLeak(t *testing.T) { assert.NotEqual(t, true, errors.Is(err, context.DeadlineExceeded), "This means the resource is exhausted. consumer.Receive() will block forever.") } - -func TestCI(t *testing.T) { - for i := 0; i < 50; i++ { - TestAvailablePermitsLeak(t) - } -}