pass lint, fixup from merge

Author: torcolvin

base/main_test_bucket_pool.go

@@ -121,7 +121,7 @@ func NewTestBucketPoolWithOptions(ctx context.Context, bucketReadierFunc TBPBuck
 		unclosedBuckets:        make(map[string]map[string]struct{}),
 		useExistingBucket:      TestUseExistingBucket(),
 		useDefaultScope:        options.UseDefaultScope,
-		skipMobileXDCR:         true, // do not set up enableCrossClusterVersioning until Sync Gateway 4.x
+		skipMobileXDCR:         false,
 	}
 
 	tbp.cluster = newTestCluster(ctx, UnitTestUrl(), &tbp)

rest/utilities_testing_blip_client.go

@@ -1341,19 +1341,6 @@ func (btcc *BlipTesterCollectionClient) StartPushWithOpts(opts BlipTesterPushOpt
 						base.DebugfCtx(ctx, base.KeySGTest, "sent doc %s / %v", change.docID, change.version)
 						// block until remote has actually processed the rev and sent a response
 						revResp := revRequest.Response()
-						/*<<<<<<< HEAD:rest/utilities_testing_blip_client.go
-						  						if status := revResp.Properties[db.BlipErrorCode]; status != "" {
-						  							if status == "409" {
-						  								// conflict on write of rev - OK to ignore and let pull replication resolve
-						  								btcc.TB().Logf("conflict on write of rev %s / %v", change.docID, change.version)
-						  							} else {
-						  								body, err := revResp.Body()
-						  								require.NoError(btcc.TB(), err)
-						  								require.FailNow(btcc.TB(), fmt.Sprintf("error response from rev: %s %s : %s", revResp.Properties["Error-Domain"], revResp.Properties["Error-Code"], body))
-						  							}
-						  						}
-						  =======
-						*/
 						require.NotContains(btcc.TB(), revResp.Properties, "Error-Domain", "unexpected error response from rev %v: %s", revResp)
 						base.DebugfCtx(ctx, base.KeySGTest, "peer acked rev %s / %v", change.docID, change.version)
 						btcc.updateLastReplicatedVersion(change.docID, change.version)
@@ -1450,7 +1437,7 @@ func (btc *BlipTesterCollectionClient) StartPullSince(options BlipTesterPullOpti
 	errorDomain := subChangesResponse.Properties["Error-Domain"]
 	errorCode := subChangesResponse.Properties["Error-Code"]
 	if errorDomain != "" && errorCode != "" {
-		require.FailNowf(btc.TB(), "error %s %s from subChanges with body: %s", errorDomain, errorCode, string(rspBody))
+		require.FailNow(btc.TB(), fmt.Sprintf("error %s %s from subChanges with body: %s", errorDomain, errorCode, string(rspBody)))
 	}
 }
 

topologytest/couchbase_lite_mock_peer_test.go

@@ -77,7 +77,7 @@ func (p *CouchbaseLiteMockPeer) getSingleSGBlipClient() *PeerBlipTesterClient {
 	for _, c := range p.blipClients {
 		return c
 	}
-	require.Fail(p.TB(), "no blipClients found for %s", p)
+	require.Fail(p.TB(), fmt.Sprintf("no blipClients found for %s", p))
 	return nil
 }
 
@@ -262,7 +262,7 @@ func (r *CouchbaseLiteMockReplication) Start() {
 	case PeerReplicationDirectionPull:
 		r.btcRunner.StartPull(r.btc.ID())
 	default:
-		require.Fail(r.btc.TB(), "unsupported replication direction %q", r.direction)
+		require.Fail(r.btc.TB(), fmt.Sprintf("unsupported replication direction %q", r.direction))
 	}
 }