Unskip topology multi-actor conflict tests

Author: bbrks

topologytest/hlv_test.go

@@ -89,10 +89,6 @@ func createConflictingDocs(t *testing.T, dsName base.ScopeAndCollectionName, pee
 		if backingPeers[peerName] {
 			continue
 		}
-		if peer.Type() == PeerTypeCouchbaseLite {
-			// FIXME: Skipping Couchbase Lite tests for multi actor conflicts, CBG-4434
-			continue
-		}
 		docBody := []byte(fmt.Sprintf(`{"activePeer": "%s", "topology": "%s", "action": "create"}`, peerName, topologyDescription))
 		docVersion := peer.CreateDocument(dsName, docID, docBody)
 		t.Logf("%s - createVersion: %#v", peerName, docVersion.docMeta)

topologytest/multi_actor_conflict_test.go

@@ -9,20 +9,14 @@
 package topologytest
 
 import (
-	"strings"
 	"testing"
-
-	"github.com/couchbase/sync_gateway/base"
 )
 
 // TestMultiActorConflictCreate
 // 1. create document on each peer with different contents
 // 2. start replications
 // 3. wait for documents to exist with hlv sources equal to the number of active peers
 func TestMultiActorConflictCreate(t *testing.T) {
-	if !base.UnitTestUrlIsWalrus() {
-		t.Skip("Flakey failures on multi actor conflicting writes, CBG-4379")
-	}
 	for _, topology := range append(simpleTopologies, Topologies...) {
 		t.Run(topology.description, func(t *testing.T) {
 			collectionName, peers, replications := setupTests(t, topology)
@@ -46,13 +40,7 @@ func TestMultiActorConflictCreate(t *testing.T) {
 // 6. start replications
 // 7. assert that the documents are deleted on all peers and have hlv sources equal to the number of active peers
 func TestMultiActorConflictUpdate(t *testing.T) {
-	if !base.UnitTestUrlIsWalrus() {
-		t.Skip("Flakey failures on multi actor conflicting writes, CBG-4379")
-	}
 	for _, topology := range append(simpleTopologies, Topologies...) {
-		if strings.Contains(topology.description, "CBL") {
-			t.Skip("CBL actor can generate conflicts and push replication fails with conflict for doc in blip tester CBL-4267")
-		}
 		t.Run(topology.description, func(t *testing.T) {
 			collectionName, peers, replications := setupTests(t, topology)
 			replications.Stop()
@@ -82,9 +70,6 @@ func TestMultiActorConflictUpdate(t *testing.T) {
 // 7. assert that the documents are deleted on all peers and have hlv sources equal to the number of active peers
 func TestMultiActorConflictDelete(t *testing.T) {
 	for _, topology := range append(simpleTopologies, Topologies...) {
-		if strings.Contains(topology.description, "CBL") {
-			t.Skip("CBL actor can generate conflicts and push replication fails with conflict for doc in blip tester CBL-4267")
-		}
 		t.Run(topology.description, func(t *testing.T) {
 			collectionName, peers, replications := setupTests(t, topology)
 			replications.Stop()
@@ -117,13 +102,7 @@ func TestMultiActorConflictDelete(t *testing.T) {
 // 10. start replications
 // 11. assert that the documents are resurrected on all peers and have hlv sources equal to the number of active peers and the document body is equivalent to the last write
 func TestMultiActorConflictResurrect(t *testing.T) {
-	if !base.UnitTestUrlIsWalrus() {
-		t.Skip("Flakey failures on multi actor conflicting writes, CBG-4379")
-	}
 	for _, topology := range append(simpleTopologies, Topologies...) {
-		if strings.Contains(topology.description, "CBL") {
-			t.Skip("CBL actor can generate conflicts and push replication fails with conflict for doc in blip tester CBL-4267")
-		}
 		t.Run(topology.description, func(t *testing.T) {
 			collectionName, peers, replications := setupTests(t, topology)
 			replications.Stop()