jiazhai closed pull request #3027: Fix C++ tests after merge URL: https://github.com/apache/pulsar/pull/3027
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java index be03247e9f..e1e84fa4ea 100644 --- a/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java +++ b/buildtools/src/main/java/org/apache/pulsar/tests/AnnotationListener.java @@ -20,6 +20,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.Method; +import java.util.concurrent.TimeUnit; import org.testng.IAnnotationTransformer; import org.testng.annotations.ITestAnnotation; @@ -27,7 +28,7 @@ @SuppressWarnings("rawtypes") public class AnnotationListener implements IAnnotationTransformer { - private static final int DEFAULT_TEST_TIMEOUT_MILLIS = 120000; + private static final long DEFAULT_TEST_TIMEOUT_MILLIS = TimeUnit.MINUTES.toMillis(5); public AnnotationListener() { System.out.println("Created annotation listener"); diff --git a/pulsar-client-cpp/tests/BasicEndToEndTest.cc b/pulsar-client-cpp/tests/BasicEndToEndTest.cc index e475ebc59e..a594a0ac1f 100644 --- a/pulsar-client-cpp/tests/BasicEndToEndTest.cc +++ b/pulsar-client-cpp/tests/BasicEndToEndTest.cc @@ -2200,7 +2200,7 @@ TEST(BasicEndToEndTest, testGetTopicPartitions) { TEST(BasicEndToEndTest, testFlushInProducer) { ClientConfiguration config; Client client(lookupUrl); - std::string topicName = "persistent://property/cluster/namespace/test-flush-in-producer"; + std::string topicName = "test-flush-in-producer"; std::string subName = "subscription-name"; Producer producer; int numOfMessages = 10; @@ -2287,10 +2287,10 @@ TEST(BasicEndToEndTest, testFlushInProducer) { TEST(BasicEndToEndTest, testFlushInPartitionedProducer) { Client client(lookupUrl); - std::string topicName = "persistent://prop/unit/ns/partition-testFlushInPartitionedProducer"; + std::string topicName = "persistent://public/default/partition-testFlushInPartitionedProducer"; // call admin api to make it partitioned std::string url = - adminUrl + "admin/persistent/prop/unit/ns/partition-testFlushInPartitionedProducer/partitions"; + adminUrl + "admin/v2/persistent/public/default/partition-testFlushInPartitionedProducer/partitions"; int res = makePutRequest(url, "5"); int numberOfPartitions = 5; ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services