You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2021/06/26 13:15:38 UTC
[pulsar] branch branch-2.7 updated: Fix cherry-pick compile issue
for branch-2.7
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.7 by this push:
new d5ef20d Fix cherry-pick compile issue for branch-2.7
d5ef20d is described below
commit d5ef20d37b30d4fa26a3ba363cc885c34f0b58a8
Author: penghui <pe...@apache.org>
AuthorDate: Sat Jun 26 21:14:36 2021 +0800
Fix cherry-pick compile issue for branch-2.7
---
.../src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java
index 22308cf..1a88f04 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/PulsarServiceTest.java
@@ -26,7 +26,6 @@ import static org.testng.AssertJUnit.assertSame;
import java.util.Optional;
import lombok.extern.slf4j.Slf4j;
import org.apache.pulsar.broker.auth.MockedPulsarServiceBaseTest;
-import org.apache.pulsar.functions.worker.WorkerConfig;
import org.apache.pulsar.functions.worker.WorkerService;
import org.testng.AssertJUnit;
import org.testng.annotations.AfterMethod;
@@ -70,7 +69,7 @@ public class PulsarServiceTest extends MockedPulsarServiceBaseTest {
configuration.setClusterName("clusterName");
configuration.setFunctionsWorkerEnabled(true);
WorkerService expectedWorkerService = mock(WorkerService.class);
- PulsarService pulsarService = spy(new PulsarService(configuration, new WorkerConfig(),
+ PulsarService pulsarService = spy(new PulsarService(configuration,
Optional.of(expectedWorkerService), (exitCode) -> {}));
WorkerService actualWorkerService = pulsarService.getWorkerService();
@@ -87,7 +86,7 @@ public class PulsarServiceTest extends MockedPulsarServiceBaseTest {
configuration.setZookeeperServers("localhost");
configuration.setClusterName("clusterName");
configuration.setFunctionsWorkerEnabled(false);
- PulsarService pulsarService = new PulsarService(configuration, new WorkerConfig(),
+ PulsarService pulsarService = new PulsarService(configuration,
Optional.empty(), (exitCode) -> {});
String errorMessage = "Pulsar Function Worker is not enabled, probably functionsWorkerEnabled is set to false";