fix failing tests and clear up work

Author: gregns1

topologytest/multi_actor_no_conflict_test.go

@@ -10,6 +10,7 @@ package topologytest
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/couchbase/sync_gateway/base"
@@ -110,14 +111,17 @@ func TestMultiActorResurrect(t *testing.T) {
 							// if cbs resurrect, if delete AND resurrecting peer is server side peer (cbs or sgw) the all docs will converge for version expected
 							// if cbs resurrect and delete AND resurrecting peer is NOT server side peer (lite), then need to wait for tombstone convergence first
 							if resurrectPeer.Type() == PeerTypeCouchbaseServer {
-								if conflictNotExpectedOnCBL([]Peer{createPeer, deletePeer, resurrectPeer}, []string{deletePeerName, createPeerName}, resurrectPeerName) { //allActorsServerSide([]Peer{createPeer, deletePeer, resurrectPeer}) || conflictNotExpectedOnCBL(deletePeer, []string{deletePeerName, createPeerName}, resurrectPeerName) {
-									// no cbl conflict?
-									waitForCVAndBody(t, collectionName, docID, resurrectVersion, topology)
+								if strings.Contains(topologySpec.description, "CBL") {
+									if conflictNotExpectedOnCBL(deletePeer, resurrectPeer, deletePeerName, resurrectPeerName) {
+										// if no cbl conflict is expected we can wait on CV and body
+										waitForCVAndBody(t, collectionName, docID, resurrectVersion, topology)
+									} else {
+										// if cbl conflict is expected we need to wait for tombstone convergence
+										waitForConvergingTombstones(t, collectionName, docID, topology)
+									}
 								} else {
-									fmt.Println("waiting for converging tombstones")
-									waitForConvergingTombstones(t, collectionName, docID, topology)
+									waitForCVAndBody(t, collectionName, docID, resurrectVersion, topology)
 								}
-								//waitForCVAndBody(t, collectionName, docID, resurrectVersion, topology)
 							} else {
 								waitForVersionAndBody(t, collectionName, docID, resurrectVersion, topology)
 							}

topologytest/peer_test.go

@@ -132,30 +132,36 @@ func (p Peers) PeerList() []string {
 	return peerNames
 }
 
-func allActorsServerSide(p []Peer) bool {
-	for _, v := range p {
-		if v.Type() == PeerTypeCouchbaseServer || v.Type() == PeerTypeSyncGateway {
-			continue
-		}
-		return false
-	}
-	return true
-}
-
-func deleteHasSGWSource(deletingPeer Peer) bool {
-	if deletingPeer.Type() == PeerTypeCouchbaseServer || deletingPeer.Type() == PeerTypeSyncGateway {
+// peerIsServerSide returns true if the peer is a Couchbase Server or Sync Gateway peer.
+func peerIsServerSide(p Peer) bool {
+	if p.Type() == PeerTypeCouchbaseServer || p.Type() == PeerTypeSyncGateway {
 		return true
 	}
 	return false
 }
 
-func conflictNotExpectedOnCBL(peers []Peer, createDelPeerNames []string, resPeerName string) bool {
-	if createDelPeerNames[1] == "sg1" && resPeerName == "cbs1" {
-		return true
+// conflictNotExpectedOnCBL will return true if no conflict is expected for delete and resurrect operations for
+// topologies with cbl peer in them and false for expected conflict
+func conflictNotExpectedOnCBL(deletePeer Peer, resurrectPeer Peer, delPeerName string, resPeerName string) bool {
+	if delPeerName == "cbl1" {
+		// cbl delete will mean cbs resurrect has a conflict
+		return false
 	}
-	if createDelPeerNames[1] == "cbs1" && resPeerName == "cbs1" {
+	if peerIsServerSide(deletePeer) && peerIsServerSide(resurrectPeer) {
+		if strings.Contains(delPeerName, "1") && strings.Contains(resPeerName, "2") {
+			fmt.Println("conflict expected due to different backing bucket")
+			// conflict expected due to different backing bucket (sourceID)
+			return false
+		}
+		if strings.Contains(delPeerName, "2") && strings.Contains(resPeerName, "1") {
+			fmt.Println("conflict expected due to different backing bucket")
+			// conflict expected due to different backing bucket (sourceID)
+			return false
+		}
+		// if both actors are server side and same backing bucket, no conflict expected
 		return true
 	}
+	// conflict expected
 	return false
 }