CBL-6289: Re-enable Actions Replication tests (#2190)

couchbase · Dec 18, 2024 · 27d3530 · 27d3530
1 parent a79ab49
commit 27d3530
Show file tree

Hide file tree

Showing 12 changed files with 173 additions and 712 deletions.
diff --git a/C/include/c4Document.h b/C/include/c4Document.h
@@ -138,6 +138,7 @@ CBL_CORE_API C4SliceResult c4doc_getRevisionHistory(C4Document* doc, unsigned ma
 CBL_CORE_API C4SliceResult c4doc_getSelectedRevIDGlobalForm(C4Document* doc) C4API;
 
 /** Selects the parent of the selected revision, if it's known, else returns false.
+ *  Throws if the document is a version-vectors document.
         \note The caller must use a lock for Document when this function is called. */
 NODISCARD CBL_CORE_API bool c4doc_selectParentRevision(C4Document* doc) C4API;
 

diff --git a/Replicator/Replicator.cc b/Replicator/Replicator.cc
@@ -589,6 +589,20 @@ namespace litecore::repl {
                                    "Incompatible replication protocol "
                                    "(missing 'Sec-WebSocket-Protocol' response header)"_sl));
         }
+
+        const auto& compats = repl::kCompatProtocols;
+
+        string       acceptedProtocol;
+        stringstream s(headers["Sec-WebSocket-Protocol"].asString());
+        string       protocol;
+        while ( getline(s, protocol, ',') ) {
+            auto i = std::find(compats.begin(), compats.end(), protocol);
+            if ( i != compats.end() ) {
+                acceptedProtocol = protocol;
+                break;
+            }
+        }
+
         if ( _delegate ) _delegate->replicatorGotHTTPResponse(this, status, headers);
         if ( slice x_corr = headers.get("X-Correlation-Id"_sl); x_corr ) {
             _correlationID = x_corr;

diff --git a/Replicator/tests/ReplParams.cc b/Replicator/tests/ReplParams.cc
@@ -3,6 +3,7 @@
 //
 
 #include "ReplParams.hh"
+#include <cstdint>
 
 ReplParams::ReplParams(const std::vector<C4ReplicationCollection>& collections_) : C4ReplicatorParameters() {
     _collectionVector = {collections_};
@@ -70,7 +71,7 @@ ReplParams& ReplParams::setCollectionOptions(C4CollectionSpec collectionSpec, co
     return *this;
 }
 
-ReplParams& ReplParams::setDocIDs(const std::vector<std::unordered_map<alloc_slice, unsigned>>& docIDs) {
+ReplParams& ReplParams::setDocIDs(const std::vector<std::unordered_map<alloc_slice, uint64_t>>& docIDs) {
     for ( size_t i = 0; i < docIDs.size(); ++i ) {
         fleece::Encoder enc;
         enc.beginArray();

diff --git a/Replicator/tests/ReplParams.hh b/Replicator/tests/ReplParams.hh
@@ -12,6 +12,7 @@
 #include "fleece/Expert.hh"
 #include "c4ReplicatorTypes.h"
 #include "ReplicatorOptions.hh"
+#include <cstdint>
 #include <vector>
 #include <unordered_map>
 
@@ -57,11 +58,11 @@ class ReplParams : public C4ReplicatorParameters {
     // Set an option for all collections
     ReplParams& setCollectionOptions(const AllocedDict& options);
     // Set docIDs in options of each collection
-    ReplParams& setDocIDs(const std::vector<std::unordered_map<alloc_slice, unsigned>>& docIDs);
+    ReplParams& setDocIDs(const std::vector<std::unordered_map<alloc_slice, uint64_t>>& docIDs);
 
     // Same as above, with array parameter
     template <size_t N>
-    ReplParams& setDocIDs(const std::array<std::unordered_map<alloc_slice, unsigned>, N>& docIDs) {
+    ReplParams& setDocIDs(const std::array<std::unordered_map<alloc_slice, uint64_t>, N>& docIDs) {
         return setDocIDs({docIDs.begin(), docIDs.end()});
     }
 

diff --git a/Replicator/tests/ReplicatorAPITest.hh b/Replicator/tests/ReplicatorAPITest.hh
@@ -58,7 +58,9 @@ class ReplicatorAPITest : public C4Test {
 
     static std::once_flag once;
 
-    ReplicatorAPITest() : C4Test(0), _sg({kDefaultAddress, kScratchDBName}) {
+    ReplicatorAPITest() : ReplicatorAPITest(0) {}
+
+    explicit ReplicatorAPITest(int option) : C4Test(option), _sg({kDefaultAddress, kScratchDBName}) {
         std::call_once(once, [&]() {
             // Register the BuiltInWebSocket class as the C4Replicator's WebSocketImpl.
             C4RegisterBuiltInWebSocket();