pulsar-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhai...@apache.org
Subject [pulsar] branch master updated: Fix C++ tests after merge (#3027)
Date Wed, 21 Nov 2018 07:39:14 GMT
This is an automated email from the ASF dual-hosted git repository.

zhaijia pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new fae43a9  Fix C++ tests after merge (#3027)
fae43a9 is described below

commit fae43a90095261163eb3a1c2c8c90a006edf74dc
Author: Matteo Merli <mmerli@apache.org>
AuthorDate: Tue Nov 20 23:39:10 2018 -0800

    Fix C++ tests after merge (#3027)
    
    Motivation
    There was a conflict between #3003 and #3020 that made C++ tests to fail after merging
because of the namespaces changes.
    
    * Fix C++ tests after merge
    * Fix topic name comparison
    * Increase tests timeout from 2 to 5min
---
 .../src/main/java/org/apache/pulsar/tests/AnnotationListener.java   | 3 ++-
 pulsar-client-cpp/tests/BasicEndToEndTest.cc                        | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

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 be03247..e1e84fa 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 @@ package org.apache.pulsar.tests;
 
 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 @@ import org.testng.annotations.ITestAnnotation;
 @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 e475ebc..a594a0a 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;
 


Mime
View raw message