couchbase 3.4.1 → 3.4.3

data/ext/couchbase/test/test_integration_range_scan.cxx

@@ -120,7 +120,7 @@ TEST_CASE("integration: range scan large values", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -176,7 +176,7 @@ TEST_CASE("integration: range scan small values", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -274,7 +274,7 @@ TEST_CASE("integration: range scan collection retry", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     collection_guard new_collection(integration);
@@ -340,7 +340,7 @@ TEST_CASE("integration: range scan only keys", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -399,7 +399,7 @@ TEST_CASE("integration: range scan cancellation before continue", "[integration]
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -503,7 +503,7 @@ TEST_CASE("integration: range scan cancel during streaming using protocol cancel
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -615,7 +615,7 @@ TEST_CASE("integration: range scan cancel during streaming using pending_operati
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -717,7 +717,7 @@ TEST_CASE("integration: sampling scan keys only", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -788,7 +788,7 @@ TEST_CASE("integration: manager scan range without content", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -859,7 +859,7 @@ TEST_CASE("integration: manager scan range with content", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     auto collection = couchbase::cluster(integration.cluster)
@@ -930,7 +930,7 @@ TEST_CASE("integration: manager sampling scan with custom collection", "[integra
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     collection_guard new_collection(integration);
@@ -1003,7 +1003,7 @@ TEST_CASE("integration: manager range scan with sort", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.has_bucket_capability("range_scan")) {
-        return;
+        SKIP("cluster does not support range_scan");
     }
 
     collection_guard new_collection(integration);

data/ext/couchbase/test/test_integration_read_replica.cxx

@@ -63,8 +63,13 @@ TEST_CASE("integration: get any replica", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (integration.number_of_replicas() == 0 && integration.number_of_nodes() <= integration.number_of_replicas()) {
-        return;
+    if (integration.number_of_replicas() == 0) {
+        SKIP("bucket has zero replicas");
+    }
+    if (integration.number_of_nodes() <= integration.number_of_replicas()) {
+        SKIP(fmt::format("number of nodes ({}) is less or equal to number of replicas ({})",
+                         integration.number_of_nodes(),
+                         integration.number_of_replicas()));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -95,8 +100,12 @@ TEST_CASE("integration: get all replicas", "[integration]")
     test::utils::integration_test_guard integration;
 
     auto number_of_replicas = integration.number_of_replicas();
-    if (number_of_replicas == 0 && integration.number_of_nodes() <= number_of_replicas) {
-        return;
+    if (number_of_replicas == 0) {
+        SKIP("bucket has zero replicas");
+    }
+    if (integration.number_of_nodes() <= number_of_replicas) {
+        SKIP(fmt::format(
+          "number of nodes ({}) is less or equal to number of replicas ({})", integration.number_of_nodes(), number_of_replicas));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -109,10 +118,16 @@ TEST_CASE("integration: get all replicas", "[integration]")
         couchbase::core::document_id id{ integration.ctx.bucket, scope_name, collection_name, key };
 
         couchbase::core::operations::insert_request req{ id, basic_doc_json };
+        req.durability_level = couchbase::durability_level::majority_and_persist_to_active;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec());
     }
 
+    if (integration.cluster_version().is_mock()) {
+        // GOCAVES does not implement syncDurability. See https://github.com/couchbaselabs/gocaves/issues/109
+        std::this_thread::sleep_for(std::chrono::seconds{ 1 });
+    }
+
     {
         auto collection =
           couchbase::cluster(integration.cluster).bucket(integration.ctx.bucket).scope(scope_name).collection(collection_name);
@@ -128,8 +143,13 @@ TEST_CASE("integration: get all replicas with missing key", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (integration.number_of_replicas() == 0 && integration.number_of_nodes() <= integration.number_of_replicas()) {
-        return;
+    if (integration.number_of_replicas() == 0) {
+        SKIP("bucket has zero replicas");
+    }
+    if (integration.number_of_nodes() <= integration.number_of_replicas()) {
+        SKIP(fmt::format("number of nodes ({}) is less or equal to number of replicas ({})",
+                         integration.number_of_nodes(),
+                         integration.number_of_replicas()));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -152,7 +172,9 @@ TEST_CASE("integration: get any replica with missing key", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (integration.number_of_nodes() <= integration.number_of_replicas()) {
-        return;
+        SKIP(fmt::format("number of nodes ({}) is less or equal to number of replicas ({})",
+                         integration.number_of_nodes(),
+                         integration.number_of_replicas()));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -173,8 +195,13 @@ TEST_CASE("integration: get any replica low-level version", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
-    if (integration.number_of_replicas() == 0 && integration.number_of_nodes() <= integration.number_of_replicas()) {
-        return;
+    if (integration.number_of_replicas() == 0) {
+        SKIP("bucket has zero replicas");
+    }
+    if (integration.number_of_nodes() <= integration.number_of_replicas()) {
+        SKIP(fmt::format("number of nodes ({}) is less or equal to number of replicas ({})",
+                         integration.number_of_nodes(),
+                         integration.number_of_replicas()));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -204,8 +231,12 @@ TEST_CASE("integration: get all replicas low-level version", "[integration]")
     test::utils::integration_test_guard integration;
 
     auto number_of_replicas = integration.number_of_replicas();
-    if (number_of_replicas == 0 && integration.number_of_nodes() <= integration.number_of_replicas()) {
-        return;
+    if (number_of_replicas == 0) {
+        SKIP("bucket has zero replicas");
+    }
+    if (integration.number_of_nodes() <= number_of_replicas) {
+        SKIP(fmt::format(
+          "number of nodes ({}) is less or equal to number of replicas ({})", integration.number_of_nodes(), number_of_replicas));
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -217,10 +248,16 @@ TEST_CASE("integration: get all replicas low-level version", "[integration]")
             { "b", 2.0 },
         };
         couchbase::core::operations::upsert_request req{ id, couchbase::core::utils::json::generate_binary(value) };
+        req.durability_level = couchbase::durability_level::majority_and_persist_to_active;
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec());
     }
 
+    if (integration.cluster_version().is_mock()) {
+        // GOCAVES does not implement syncDurability. See https://github.com/couchbaselabs/gocaves/issues/109
+        std::this_thread::sleep_for(std::chrono::seconds{ 1 });
+    }
+
     {
         couchbase::core::operations::get_all_replicas_request req{ id };
         auto resp = test::utils::execute(integration.cluster, req);