couchbase 3.4.2 → 3.4.4

data/ext/couchbase/test/test_helper.hxx

@@ -17,17 +17,17 @@
 
 #pragma once
 
-#define CATCH_CONFIG_MAIN
-
 #include "utils/binary.hxx"
 #include "utils/test_context.hxx"
 #include "utils/test_data.hxx"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
-#define REQUIRE_SUCCESS(ec) INFO((ec).message()) REQUIRE_FALSE(ec)
+#define REQUIRE_SUCCESS(ec)                                                                                                                \
+    INFO((ec).message());                                                                                                                  \
+    REQUIRE_FALSE(ec)
 #define EXPECT_SUCCESS(result)                                                                                                             \
     if (!result) {                                                                                                                         \
-        INFO(result.error().message())                                                                                                     \
+        INFO(result.error().message());                                                                                                    \
     }                                                                                                                                      \
     REQUIRE(result)

data/ext/couchbase/test/test_integration_analytics.cxx

@@ -24,8 +24,12 @@ TEST_CASE("integration: analytics query")
 {
     test::utils::integration_test_guard integration;
 
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("elixir deployment does not support analytics");
+    }
+
     if (!integration.cluster_version().supports_analytics()) {
-        return;
+        SKIP("cluster does not support analytics");
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -180,8 +184,15 @@ TEST_CASE("integration: analytics scope query")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics() || !integration.cluster_version().supports_collections()) {
-        return;
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("elixir deployment does not support analytics");
+    }
+
+    if (!integration.cluster_version().supports_analytics()) {
+        SKIP("cluster does not support analytics");
+    }
+    if (!integration.cluster_version().supports_collections()) {
+        SKIP("cluster does not support collections");
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -286,8 +297,12 @@ TEST_CASE("integration: public API analytics query")
 {
     test::utils::integration_test_guard integration;
 
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("elixir deployment does not support analytics");
+    }
+
     if (!integration.cluster_version().supports_analytics()) {
-        return;
+        SKIP("cluster does not support analytics");
     }
 
     auto cluster = couchbase::cluster(integration.cluster);
@@ -468,8 +483,15 @@ TEST_CASE("integration: public API analytics scope query")
 {
     test::utils::integration_test_guard integration;
 
-    if (!integration.cluster_version().supports_analytics() || !integration.cluster_version().supports_collections()) {
-        return;
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("elixir deployment does not support analytics");
+    }
+
+    if (!integration.cluster_version().supports_analytics()) {
+        SKIP("cluster does not support analytics");
+    }
+    if (!integration.cluster_version().supports_collections()) {
+        SKIP("cluster does not support collections");
     }
 
     auto cluster = couchbase::cluster(integration.cluster);

data/ext/couchbase/test/test_integration_collections.cxx

@@ -25,7 +25,7 @@ TEST_CASE("integration: missing scope and collection", "[integration]")
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
 
     SECTION("get missing scope")
@@ -77,7 +77,7 @@ TEST_CASE("integration: get and insert non default scope and collection", "[inte
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
 
     auto scope_name = test::utils::uniq_id("scope");
@@ -113,6 +113,12 @@ TEST_CASE("integration: get and insert non default scope and collection", "[inte
         REQUIRE_SUCCESS(resp.ctx.ec());
         REQUIRE(resp.value == couchbase::core::utils::to_binary(key));
     }
+
+    {
+        couchbase::core::operations::management::scope_drop_request req{ integration.ctx.bucket, scope_name };
+        auto resp = test::utils::execute(integration.cluster, req);
+        REQUIRE_SUCCESS(resp.ctx.ec);
+    }
 }
 
 TEST_CASE("integration: insert into dropped scope", "[integration]")
@@ -121,7 +127,7 @@ TEST_CASE("integration: insert into dropped scope", "[integration]")
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (!integration.cluster_version().supports_collections()) {
-        return;
+        SKIP("cluster does not support collections");
     }
 
     auto scope_name = test::utils::uniq_id("scope");
@@ -166,6 +172,10 @@ TEST_CASE("integration: insert into dropped scope", "[integration]")
         REQUIRE(dropped);
     }
 
+    if (integration.cluster_version().is_mock()) {
+        SKIP("GOCAVES does not generate error when inserting into dropped collection. See "
+             "https://github.com/couchbaselabs/gocaves/issues/108");
+    }
     {
         couchbase::core::operations::upsert_request req{ id, couchbase::core::utils::to_binary(key) };
         auto resp = test::utils::execute(integration.cluster, req);

data/ext/couchbase/test/test_integration_connect.cxx

@@ -42,9 +42,9 @@ TEST_CASE("integration: connecting with unresponsive first node in bootstrap nod
     test::utils::init_logger();
     asio::io_context io{};
     auto ctx = test::utils::test_context::load_from_environment();
-    if (ctx.deployment == test::utils::deployment_type::capella) {
+    if (ctx.deployment == test::utils::deployment_type::capella || ctx.deployment == test::utils::deployment_type::elixir) {
         // This breaks SRV assumptions (only one host in connection string)
-        return;
+        SKIP("capella deployment uses single host in the connection string, which assumed to be reachable");
     }
     auto connstr = couchbase::core::utils::parse_connection_string(ctx.connection_string);
     REQUIRE_FALSE(connstr.bootstrap_nodes.empty());
@@ -125,6 +125,10 @@ TEST_CASE("integration: destroy cluster without waiting for close completion", "
     test::utils::init_logger();
     auto ctx = test::utils::test_context::load_from_environment();
 
+    if (ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("elixir deployment is incompatible with parts of this test, but it is probably bug in SDK. FIXME");
+    }
+
     asio::io_context io{};
 
     auto cluster = couchbase::core::cluster::create(io);
@@ -143,7 +147,7 @@ TEST_CASE("integration: destroy cluster without waiting for close completion", "
     }
 
     // hit Query
-    {
+    if (ctx.version.supports_query()) {
         couchbase::core::operations::query_request req{ R"(SELECT 42 AS the_answer)" };
         auto resp = test::utils::execute(cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec);

data/ext/couchbase/test/test_integration_crud.cxx

@@ -35,6 +35,10 @@ TEST_CASE("integration: switching off mutation token", "[integration]")
     opts.enable_mutation_tokens = false;
     test::utils::integration_test_guard integration(opts);
 
+    if (integration.cluster_version().is_mock()) {
+        SKIP("GOCAVES does not allow to switching off mutation tokens. See https://github.com/couchbaselabs/gocaves/issues/100");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     couchbase::core::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("foo") };
 
@@ -228,7 +232,8 @@ TEST_CASE("integration: pessimistic locking", "[integration]")
     {
         couchbase::core::operations::get_and_lock_request req{ id };
         req.lock_time = lock_time;
-        if (integration.ctx.deployment == test::utils::deployment_type::capella) {
+        if (integration.ctx.deployment == test::utils::deployment_type::capella ||
+            integration.ctx.deployment == test::utils::deployment_type::elixir) {
             req.timeout = std::chrono::seconds{ 2 };
         }
         auto resp = test::utils::execute(integration.cluster, req);
@@ -310,6 +315,11 @@ TEST_CASE("integration: lock/unlock without lock time", "[integration]")
 TEST_CASE("integration: touch with zero expiry resets expiry", "[integration]")
 {
     test::utils::integration_test_guard integration;
+
+    if (integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("Timeout is too strict for sanity test env");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     couchbase::core::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("get_reset_expiry_key") };
@@ -489,7 +499,7 @@ TEST_CASE("integration: upsert preserve expiry", "[integration]")
     test::utils::integration_test_guard integration;
 
     if (!integration.cluster_version().supports_preserve_expiry()) {
-        return;
+        SKIP("cluster does not support preserve expiry");
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -670,6 +680,10 @@ TEST_CASE("integration: open bucket that does not exist", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (integration.cluster_version().is_mock()) {
+        SKIP("GOCAVES returns not_found (0x01) instead of no_access (0x24). See https://github.com/couchbaselabs/gocaves/issues/102");
+    }
+
     auto bucket_name = test::utils::uniq_id("missing_bucket");
 
     auto barrier = std::make_shared<std::promise<std::error_code>>();
@@ -814,7 +828,8 @@ TEST_CASE("integration: pessimistic locking with public API", "[integration]")
     // it is not allowed to lock the same key twice
     {
         couchbase::get_and_lock_options options{};
-        if (integration.ctx.deployment == test::utils::deployment_type::capella) {
+        if (integration.ctx.deployment == test::utils::deployment_type::capella ||
+            integration.ctx.deployment == test::utils::deployment_type::elixir) {
             options.timeout(std::chrono::seconds{ 2 });
         }
         auto [ctx, resp] = collection.get_and_lock(id, lock_time, options).get();

data/ext/couchbase/test/test_integration_diagnostics.cxx

@@ -321,14 +321,18 @@ TEST_CASE("integration: fetch diagnostics after N1QL query", "[integration]")
 {
     test::utils::integration_test_guard integration;
 
+    if (!integration.cluster_version().supports_query() || integration.ctx.deployment == test::utils::deployment_type::elixir) {
+        SKIP("cluster does not support query or cluster level query");
+    }
+
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
     {
         couchbase::core::operations::query_request req{ "SELECT 'hello, couchbase' AS greetings" };
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec);
-        INFO("rows.size() =" << resp.rows.size())
+        INFO("rows.size() =" << resp.rows.size());
         REQUIRE(resp.rows.size() == 1);
-        INFO("row=" << resp.rows[0])
+        INFO("row=" << resp.rows[0]);
         REQUIRE(resp.rows[0] == R"({"greetings":"hello, couchbase"})");
     }
     {
@@ -365,8 +369,10 @@ TEST_CASE("integration: ping", "[integration]")
         REQUIRE(res.services.count(couchbase::core::service_type::management) > 0);
         REQUIRE(res.services[couchbase::core::service_type::management].size() > 0);
 
-        REQUIRE(res.services.count(couchbase::core::service_type::view) > 0);
-        REQUIRE(res.services[couchbase::core::service_type::view].size() > 0);
+        if (integration.ctx.deployment != test::utils::deployment_type::elixir) {
+            REQUIRE(res.services.count(couchbase::core::service_type::view) > 0);
+            REQUIRE(res.services[couchbase::core::service_type::view].size() > 0);
+        }
 
         REQUIRE(res.services.count(couchbase::core::service_type::query) > 0);
         REQUIRE(res.services[couchbase::core::service_type::query].size() > 0);
@@ -385,7 +391,7 @@ TEST_CASE("integration: ping", "[integration]")
         }
 
         REQUIRE(res.id == "my_report_id");
-        INFO(res.sdk)
+        INFO(res.sdk);
         REQUIRE(res.sdk.find("cxx/") == 0);
     }
 }

data/ext/couchbase/test/test_integration_durability.cxx

@@ -25,7 +25,7 @@ TEST_CASE("integration: durable operations", "[integration]")
 {
     test::utils::integration_test_guard integration;
     if (!integration.cluster_version().supports_enhanced_durability()) {
-        return;
+        SKIP("cluster does not support enhanced durability");
     }
 
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
@@ -68,7 +68,7 @@ TEST_CASE("integration: durable operations", "[integration]")
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec());
         REQUIRE(!resp.cas.empty());
-        REQUIRE(resp.value == couchbase::core::utils::to_binary(R"({"foo":"bar","baz":42})"));
+        REQUIRE(couchbase::core::utils::json::parse_binary(resp.value) == couchbase::core::utils::json::parse(R"({"foo":"bar","baz":42})"));
     }
     {
         couchbase::core::operations::remove_request req{ id };
@@ -83,8 +83,13 @@ TEST_CASE("integration: durable operations", "[integration]")
 TEST_CASE("integration: legacy durability persist to active and replicate to one", "[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);
@@ -124,7 +129,7 @@ TEST_CASE("integration: low level legacy durability impossible if number of node
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (integration.number_of_replicas() == 3) {
-        return;
+        SKIP("bucket has three replicas configured, so the test will not be applicable");
     }
 
     couchbase::core::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("foo") };
@@ -159,7 +164,7 @@ TEST_CASE("integration: low level legacy durability persist to active and replic
     test::utils::open_bucket(integration.cluster, integration.ctx.bucket);
 
     if (integration.number_of_replicas() < 1) {
-        return;
+        SKIP("bucket does not have replicas configured");
     }
 
     couchbase::core::document_id id{ integration.ctx.bucket, "_default", "_default", test::utils::uniq_id("foo") };
@@ -211,7 +216,7 @@ TEST_CASE("integration: low level legacy durability persist to active and replic
         auto resp = test::utils::execute(integration.cluster, req);
         REQUIRE_SUCCESS(resp.ctx.ec());
         REQUIRE(!resp.cas.empty());
-        REQUIRE(resp.value == couchbase::core::utils::to_binary(R"({"foo":"bar","baz":42})"));
+        REQUIRE(couchbase::core::utils::json::parse_binary(resp.value) == couchbase::core::utils::json::parse(R"({"foo":"bar","baz":42})"));
     }
     {
         couchbase::core::operations::remove_request_with_legacy_durability req{