[4.1.2 Backport] CBG-5547: Fix norev handling in BlipTesterCollectionClient

Cherry-picked from be474ebbdd0c8b0f26ba9c1c3b56cd6f83e9df15 (CBG-5547, #8459)
and 1646aec (CBG-5547, #8552), squashed.
rest/cbl_conflict_test.go imports github.com/stretchr/testify for assert and
require instead of the testing/assert and testing/require wrappers, which
4.1.2 does not have.

Co-authored-by: Tor Colvin <tor.colvin@couchbase.com>
Co-authored-by: Ben Brooks <ben.brooks@couchbase.com>
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>

Author: 3 people

rest/blip_api_crud_test.go

@@ -1964,18 +1964,12 @@ func TestSendReplacementRevision(t *testing.T) {
 					base.RequireWaitForStat(t, rt.GetDatabase().DbStats.CBLReplicationPull().NoRevSendCount.Value, 0)
 				} else {
 					// requested revision (or any alternative) did not get replicated
-					data := btcRunner.SingleCollection(btc.id).WaitForVersion(docID, version1)
-					assert.Nil(t, data)
+					btcRunner.SingleCollection(btc.id).WaitForPullNoRevMessage(docID, version1)
 
 					// no message for rev 2
 					_, ok := btcRunner.SingleCollection(btc.id).GetPullRevMessage(docID, version2)
 					require.False(t, ok)
 
-					// norev message for the requested rev
-					msg, ok := btcRunner.SingleCollection(btc.id).GetPullRevMessage(docID, version1)
-					require.True(t, ok)
-					assert.Equal(t, db.MessageNoRev, msg.Profile())
-
 					base.RequireWaitForStat(t, rt.GetDatabase().DbStats.CBLReplicationPull().NoRevSendCount.Value, 1)
 					base.RequireWaitForStat(t, rt.GetDatabase().DbStats.CBLReplicationPull().ReplacementRevSendCount.Value, 0)
 				}
@@ -3097,11 +3091,8 @@ func TestImportInvalidSyncGetsNoRev(t *testing.T) {
 		require.NoError(t, err)
 
 		btcRunner.StartOneshotPull(btc.id)
-		msg := btcRunner.WaitForPullRevMessage(btc.id, docID, version)
-		require.Equal(t, db.MessageNoRev, msg.Profile())
-
-		msg = btcRunner.WaitForPullRevMessage(btc.id, docID2, version2)
-		require.Equal(t, db.MessageNoRev, msg.Profile())
+		btcRunner.WaitForPullNoRevMessage(btc.id, docID, version)
+		btcRunner.WaitForPullNoRevMessage(btc.id, docID2, version2)
 	})
 }
 
@@ -3220,8 +3211,7 @@ func TestOnDemandImportBlipFailure(t *testing.T) {
 
 				btcRunner.StartOneshotPull(btc2.id)
 
-				msg := btcRunner.WaitForPullRevMessage(btc2.id, docID, revID)
-				require.Equal(t, db.MessageNoRev, msg.Profile())
+				btcRunner.WaitForPullNoRevMessage(btc2.id, docID, revID)
 			})
 		}
 	})
@@ -3501,57 +3491,6 @@ func TestBlipPushRevOnResurrection(t *testing.T) {
 	})
 }
 
-func TestBlipPullConflict(t *testing.T) {
-	base.SetUpTestLogging(t, base.LevelDebug, base.KeySync, base.KeySyncMsg, base.KeySGTest)
-	btcRunner := NewBlipTesterClientRunner(t)
-
-	btcRunner.SkipSubtest[RevtreeSubtestName] = true
-
-	btcRunner.Run(func(t *testing.T) {
-		rt := NewRestTesterPersistentConfig(t)
-		defer rt.Close()
-
-		const (
-			alice   = "alice"
-			cblBody = `{"actor": "cbl"}`
-			sgBody  = `{"actor": "sg"}`
-			docID   = "doc1"
-		)
-		rt.CreateUser(alice, []string{"*"})
-		sgVersion := rt.PutDoc(docID, `{"actor": "sg"}`)
-		rt.WaitForPendingChanges()
-
-		opts := &BlipTesterClientOpts{
-			Username: alice,
-		}
-		btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, opts)
-		defer btc.Close()
-
-		client := btcRunner.SingleCollection(btc.id)
-		preConflictCBLVersion := btcRunner.AddRev(btc.id, docID, EmptyDocVersion(), []byte(cblBody))
-		require.NotEqual(t, sgVersion, preConflictCBLVersion)
-		_, preConflictHLV, _ := client.GetDoc(docID)
-		require.Empty(t, preConflictHLV.PreviousVersions)
-		require.Empty(t, preConflictHLV.MergeVersions)
-
-		btcRunner.StartOneshotPull(btc.id)
-
-		// expect resolution as CBL wins (local wins)
-		require.EventuallyWithT(t, func(c *assert.CollectT) {
-			body, postConflictHLV, _ := client.GetDoc(docID)
-			assert.Equal(c, db.HybridLogicalVector{
-				CurrentVersionCAS: 0,
-				Version:           preConflictCBLVersion.CV.Value,
-				SourceID:          preConflictCBLVersion.CV.SourceID,
-				PreviousVersions: db.HLVVersions{
-					sgVersion.CV.SourceID: sgVersion.CV.Value,
-				},
-			}, *postConflictHLV)
-			assert.Equal(c, string(body), cblBody)
-		}, time.Second*10, time.Millisecond*10)
-	})
-}
-
 func TestManyChannelsRemovedOnDocUpdate(t *testing.T) {
 	base.SetUpTestLogging(t, base.LevelDebug, base.KeyHTTP, base.KeySync, base.KeySyncMsg, base.KeyChanges, base.KeyCache, base.KeySGTest)
 
@@ -3766,113 +3705,7 @@ func TestBlipNoRevOnCorruptHistory(t *testing.T) {
 		expectedVersion := DocVersion{RevTreeID: "3-c"}
 
 		btcRunner.StartOneshotPull(btc.id)
-		msg := btcRunner.WaitForPullRevMessage(btc.id, docID, expectedVersion)
-		require.Equal(t, db.MessageNoRev, msg.Profile())
-	})
-}
-
-func TestBlipNoRevOnCorruptHistoryDelta(t *testing.T) {
-	base.TestRequiresDeltaSync(t)
-	base.SetUpTestLogging(t, base.LevelDebug, base.KeyHTTP, base.KeySync, base.KeySyncMsg, base.KeyCache, base.KeyCRUD, base.KeySGTest)
-	btcRunner := NewBlipTesterClientRunner(t)
-	// a norev message is only sent on delta sync when v2 protocol is used, otherwise the deleted flag on a changes
-	// message is used
-	btcRunner.RunSubprotocolV2(func(t *testing.T) {
-		rt := NewRestTester(t,
-			&RestTesterConfig{
-				PersistentConfig: true,
-				SyncFn:           channels.DocChannelsSyncFunction,
-			},
-		)
-		defer rt.Close()
-
-		dbConfig := rt.NewDbConfig()
-		dbConfig.DeltaSync = &DeltaSyncConfig{Enabled: base.Ptr(true)}
-		dbConfig.AutoImport = false
-		RequireStatus(t, rt.CreateDatabase("db", dbConfig), http.StatusCreated)
-
-		const user = "user"
-		const channelA = "A"
-		rt.CreateUser(user, []string{channelA})
-		btc := btcRunner.NewBlipTesterClientOptsWithRT(rt, &BlipTesterClientOpts{
-			Username:     user,
-			ClientDeltas: true,
-		})
-		defer btc.Close()
-
-		ctx := rt.Context()
-		docID := SafeDocumentName(t, t.Name())
-		docRev1 := rt.CreateDocNoHLV(docID, db.Body{"delta": true, "channels": []string{channelA}})
-		btcRunner.StartOneshotPull(btc.id)
-		btcRunner.WaitForVersion(btc.id, docID, DocVersion{RevTreeID: docRev1.GetRevTreeID()})
-		seq, err := rt.GetDatabase().NextSequence(ctx)
-		require.NoError(t, err)
-		// document contains an invalid revtree
-		//
-		// 3-c is a child of 3-d, a revision must be one or more generations higher than it its parent, not equal
-		badSyncRaw := `{
-			"cas": "expand",
-			"channel_set":  [
-				{
-					"end": {{.rev3seq}},
-					"name": "A",
-					"start": {{.rev1seq}}
-				}
-			],
-			"channels": {
-				"A": {
-					"rev": "{{.rev1}}",
-					"seq": {{.rev3seq}}
-				}
-			},
-			"channel_set_history": null,
-			"history": {
-				"parents": [
-					3,
-					0,
-					-1,
-					2
-				],
-				"revs": [
-					"3-d",
-					"3-c",
-					"{{.rev1}}",
-					"2-b"
-				]
-			},
-			"rev": "3-c",
-			"sequence": {{.rev3seq}},
-			"value_crc32c": "expand"
-		}`
-		tmpl := template.Must(template.New("badSync").Option("missingkey=error").Parse(badSyncRaw))
-		var badSyncData bytes.Buffer
-		require.NoError(t, tmpl.Execute(&badSyncData, map[string]any{
-			"rev1":    docRev1.GetRevTreeID(),
-			"rev1seq": docRev1.Sequence,
-			"rev3seq": seq,
-		}))
-
-		mutateInOptions := db.DefaultMutateInOpts()
-		_, err = rt.GetSingleDataStore().WriteWithXattrs(
-			ctx,
-			docID,
-			0,
-			docRev1.Cas,
-			[]byte(`{"key":"value"}`),
-			map[string][]byte{
-				base.SyncXattrName: badSyncData.Bytes(),
-			},
-			nil,
-			mutateInOptions,
-		)
-		require.NoError(t, err)
-
-		rt.WaitForPendingChanges()
-		expectedVersion := DocVersion{RevTreeID: "3-c"}
-
-		btcRunner.StartOneshotPull(btc.id)
-		msg := btcRunner.WaitForPullRevMessage(btc.id, docID, expectedVersion)
-		require.Equal(t, db.MessageNoRev, msg.Profile())
+		btcRunner.WaitForPullNoRevMessage(btc.id, docID, expectedVersion)
 	})
 }