This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.8
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.8 by this push:
new 468eedc [Branch-2.8]fix testSetReplicatedSubscriptionStatus run
failed (#11661)
468eedc is described below
commit 468eedc0735d512c2853ca3953c58d941a84075e
Author: Hang Chen <[email protected]>
AuthorDate: Fri Aug 13 18:50:38 2021 +0800
[Branch-2.8]fix testSetReplicatedSubscriptionStatus run failed (#11661)
### Motivation
The test `testSetReplicatedSubscriptionStatus ` add by #10790, and the code
`persistentTopics.createPartitionedTopic(response, testTenant, testNamespace,
topicName, 2, true);` `createLocalTopicOnly` set `true`. However, when the PR
cherry-pick to branch-2.8, this commit
`https://github.com/apache/pulsar/commit/0706bc01a428a9405c671a0f80fb54faccdd26e6`,
which lead the test run failed.
---
.github/workflows/ci-build-macos.yaml | 1 +
.github/workflows/ci-cpp-build-centos7.yaml | 1 +
.github/workflows/ci-cpp-build-windows.yaml | 1 +
.github/workflows/ci-cpp.yaml | 1 +
.github/workflows/ci-go-functions-style.yaml | 1 +
.github/workflows/ci-go-functions-test.yaml | 1 +
.github/workflows/ci-integration-backwards-compatibility.yaml | 1 +
.github/workflows/ci-integration-cli.yaml | 1 +
.github/workflows/ci-integration-function.yaml | 1 +
.github/workflows/ci-integration-messaging.yaml | 1 +
.github/workflows/ci-integration-process.yaml | 1 +
.github/workflows/ci-integration-schema.yaml | 1 +
.github/workflows/ci-integration-sql.yaml | 1 +
.github/workflows/ci-integration-standalone.yaml | 1 +
.github/workflows/ci-integration-thread.yaml | 1 +
.github/workflows/ci-integration-tiered-filesystem.yaml | 1 +
.github/workflows/ci-integration-tiered-jcloud.yaml | 1 +
.github/workflows/ci-integration-transaction.yaml | 1 +
.github/workflows/ci-license.yaml | 1 +
.github/workflows/ci-shade-test.yaml | 1 +
.github/workflows/ci-unit-broker-broker-gp1.yaml | 1 +
.github/workflows/ci-unit-broker-broker-gp2.yaml | 1 +
.github/workflows/ci-unit-broker-client-api.yaml | 1 +
.github/workflows/ci-unit-broker-client-impl.yaml | 1 +
.github/workflows/ci-unit-broker-jdk8.yaml | 1 +
.github/workflows/ci-unit-broker-other.yaml | 1 +
.github/workflows/ci-unit-proxy.yaml | 1 +
.github/workflows/ci-unit.yaml | 1 +
.../test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java | 3 +--
29 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/ci-build-macos.yaml
b/.github/workflows/ci-build-macos.yaml
index eaedea8..49167ab 100644
--- a/.github/workflows/ci-build-macos.yaml
+++ b/.github/workflows/ci-build-macos.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-cpp-build-centos7.yaml
b/.github/workflows/ci-cpp-build-centos7.yaml
index 55151ba..bc480d4 100644
--- a/.github/workflows/ci-cpp-build-centos7.yaml
+++ b/.github/workflows/ci-cpp-build-centos7.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
paths:
- '.github/workflows/**'
- 'pulsar-client-cpp/**'
diff --git a/.github/workflows/ci-cpp-build-windows.yaml
b/.github/workflows/ci-cpp-build-windows.yaml
index a287a4c..cc99204 100644
--- a/.github/workflows/ci-cpp-build-windows.yaml
+++ b/.github/workflows/ci-cpp-build-windows.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
paths:
- '.github/workflows/**'
- 'pulsar-client-cpp/**'
diff --git a/.github/workflows/ci-cpp.yaml b/.github/workflows/ci-cpp.yaml
index 94d1210..4780a93 100644
--- a/.github/workflows/ci-cpp.yaml
+++ b/.github/workflows/ci-cpp.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-go-functions-style.yaml
b/.github/workflows/ci-go-functions-style.yaml
index 4c77cf2..d033b1a 100644
--- a/.github/workflows/ci-go-functions-style.yaml
+++ b/.github/workflows/ci-go-functions-style.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
paths:
- '.github/workflows/**'
- 'pulsar-function-go/**'
diff --git a/.github/workflows/ci-go-functions-test.yaml
b/.github/workflows/ci-go-functions-test.yaml
index 37e8b81..c19bc0e 100644
--- a/.github/workflows/ci-go-functions-test.yaml
+++ b/.github/workflows/ci-go-functions-test.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
paths:
- '.github/workflows/**'
- 'pulsar-function-go/**'
diff --git a/.github/workflows/ci-integration-backwards-compatibility.yaml
b/.github/workflows/ci-integration-backwards-compatibility.yaml
index ea9dc0d..9058060 100644
--- a/.github/workflows/ci-integration-backwards-compatibility.yaml
+++ b/.github/workflows/ci-integration-backwards-compatibility.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-cli.yaml
b/.github/workflows/ci-integration-cli.yaml
index 47af7d1..aaf4e12 100644
--- a/.github/workflows/ci-integration-cli.yaml
+++ b/.github/workflows/ci-integration-cli.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-function.yaml
b/.github/workflows/ci-integration-function.yaml
index c4f9e07..862e2a4 100644
--- a/.github/workflows/ci-integration-function.yaml
+++ b/.github/workflows/ci-integration-function.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-messaging.yaml
b/.github/workflows/ci-integration-messaging.yaml
index 00e615b..c6e05f5 100644
--- a/.github/workflows/ci-integration-messaging.yaml
+++ b/.github/workflows/ci-integration-messaging.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-process.yaml
b/.github/workflows/ci-integration-process.yaml
index 404ce7a..56fa445 100644
--- a/.github/workflows/ci-integration-process.yaml
+++ b/.github/workflows/ci-integration-process.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-schema.yaml
b/.github/workflows/ci-integration-schema.yaml
index 571d22a..bb3b158 100644
--- a/.github/workflows/ci-integration-schema.yaml
+++ b/.github/workflows/ci-integration-schema.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-sql.yaml
b/.github/workflows/ci-integration-sql.yaml
index 74951e3..cfcc7b2 100644
--- a/.github/workflows/ci-integration-sql.yaml
+++ b/.github/workflows/ci-integration-sql.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-standalone.yaml
b/.github/workflows/ci-integration-standalone.yaml
index 19b8bfd..d8c55fb 100644
--- a/.github/workflows/ci-integration-standalone.yaml
+++ b/.github/workflows/ci-integration-standalone.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-thread.yaml
b/.github/workflows/ci-integration-thread.yaml
index cd22c84..18fcfd6 100644
--- a/.github/workflows/ci-integration-thread.yaml
+++ b/.github/workflows/ci-integration-thread.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-tiered-filesystem.yaml
b/.github/workflows/ci-integration-tiered-filesystem.yaml
index 3ae4fca..8be3ac0 100644
--- a/.github/workflows/ci-integration-tiered-filesystem.yaml
+++ b/.github/workflows/ci-integration-tiered-filesystem.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-tiered-jcloud.yaml
b/.github/workflows/ci-integration-tiered-jcloud.yaml
index 2f3dc3e..cf345e3 100644
--- a/.github/workflows/ci-integration-tiered-jcloud.yaml
+++ b/.github/workflows/ci-integration-tiered-jcloud.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-integration-transaction.yaml
b/.github/workflows/ci-integration-transaction.yaml
index b53814e..b2a7111 100644
--- a/.github/workflows/ci-integration-transaction.yaml
+++ b/.github/workflows/ci-integration-transaction.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-license.yaml
b/.github/workflows/ci-license.yaml
index a25eb26..52bc815 100644
--- a/.github/workflows/ci-license.yaml
+++ b/.github/workflows/ci-license.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-shade-test.yaml
b/.github/workflows/ci-shade-test.yaml
index 7548ca1..c3e2b42 100644
--- a/.github/workflows/ci-shade-test.yaml
+++ b/.github/workflows/ci-shade-test.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-broker-gp1.yaml
b/.github/workflows/ci-unit-broker-broker-gp1.yaml
index e200d61..5cd6e1a 100644
--- a/.github/workflows/ci-unit-broker-broker-gp1.yaml
+++ b/.github/workflows/ci-unit-broker-broker-gp1.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-broker-gp2.yaml
b/.github/workflows/ci-unit-broker-broker-gp2.yaml
index 1175c0f..11b7928 100644
--- a/.github/workflows/ci-unit-broker-broker-gp2.yaml
+++ b/.github/workflows/ci-unit-broker-broker-gp2.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-client-api.yaml
b/.github/workflows/ci-unit-broker-client-api.yaml
index 3aaba36..fc8da08 100644
--- a/.github/workflows/ci-unit-broker-client-api.yaml
+++ b/.github/workflows/ci-unit-broker-client-api.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-client-impl.yaml
b/.github/workflows/ci-unit-broker-client-impl.yaml
index f18776a..a739062 100644
--- a/.github/workflows/ci-unit-broker-client-impl.yaml
+++ b/.github/workflows/ci-unit-broker-client-impl.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-jdk8.yaml
b/.github/workflows/ci-unit-broker-jdk8.yaml
index 623c3ac..a61def5 100644
--- a/.github/workflows/ci-unit-broker-jdk8.yaml
+++ b/.github/workflows/ci-unit-broker-jdk8.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-broker-other.yaml
b/.github/workflows/ci-unit-broker-other.yaml
index 9098139..6301ae9 100644
--- a/.github/workflows/ci-unit-broker-other.yaml
+++ b/.github/workflows/ci-unit-broker-other.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit-proxy.yaml
b/.github/workflows/ci-unit-proxy.yaml
index 6911b3c..105cfc3 100644
--- a/.github/workflows/ci-unit-proxy.yaml
+++ b/.github/workflows/ci-unit-proxy.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git a/.github/workflows/ci-unit.yaml b/.github/workflows/ci-unit.yaml
index 5715cf2..373df8f 100644
--- a/.github/workflows/ci-unit.yaml
+++ b/.github/workflows/ci-unit.yaml
@@ -22,6 +22,7 @@ on:
pull_request:
branches:
- master
+ - branch-*
push:
branches:
- branch-*
diff --git
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
index d298147..ad37635 100644
---
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
+++
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java
@@ -803,7 +803,7 @@ public class PersistentTopicsTest extends
MockedPulsarServiceBaseTest {
// 3) Create the partitioned topic
response = mock(AsyncResponse.class);
ArgumentCaptor<Response> responseCaptor =
ArgumentCaptor.forClass(Response.class);
- persistentTopics.createPartitionedTopic(response, testTenant,
testNamespace, topicName, 2, false);
+ persistentTopics.createPartitionedTopic(response, testTenant,
testNamespace, topicName, 2, true);
verify(response,
timeout(10000).times(1)).resume(responseCaptor.capture());
Assert.assertEquals(responseCaptor.getValue().getStatus(),
Response.Status.NO_CONTENT.getStatusCode());
@@ -857,5 +857,4 @@ public class PersistentTopicsTest extends
MockedPulsarServiceBaseTest {
verify(response,
timeout(10000).times(1)).resume(responseCaptor.capture());
Assert.assertEquals(responseCaptor.getValue().getStatus(),
Response.Status.NO_CONTENT.getStatusCode());
}
-
}
