CBG-4538 do not expect revSeqNo as a particular value

couchbase · Feb 28, 2025 · 15ce5c0 · 15ce5c0
1 parent f2939ae
commit 15ce5c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/db/import_test.go b/db/import_test.go
@@ -102,6 +102,8 @@ func TestOnDemandImportMou(t *testing.T) {
 		collection, ctx := GetSingleDatabaseCollectionWithUser(ctx, t, db)
 		writeCas, err := collection.dataStore.WriteCas(getKey, 0, 0, bodyBytes, 0)
 		require.NoError(t, err)
+		startingRevSeqNo, _, err := collection.getRevSeqNo(ctx, getKey)
+		require.NoError(t, err)
 
 		// fetch the document to trigger on-demand import
 		doc, err := collection.GetDocument(ctx, getKey, DocUnmarshalAll)
@@ -111,7 +113,7 @@ func TestOnDemandImportMou(t *testing.T) {
 			require.NotNil(t, doc.MetadataOnlyUpdate)
 			require.Equal(t, base.CasToString(writeCas), doc.MetadataOnlyUpdate.PreviousHexCAS)
 			require.Equal(t, base.CasToString(doc.Cas), doc.MetadataOnlyUpdate.HexCAS)
-			require.Equal(t, uint64(1), doc.MetadataOnlyUpdate.PreviousRevSeqNo)
+			require.Equal(t, startingRevSeqNo, doc.MetadataOnlyUpdate.PreviousRevSeqNo)
 		} else {
 			require.Nil(t, doc.MetadataOnlyUpdate)
 		}
@@ -135,6 +137,8 @@ func TestOnDemandImportMou(t *testing.T) {
 					ID: writeKey,
 				}
 				newDoc.UpdateBodyBytes([]byte(`{"foo": "baz"}`))
+				startingRevSeqNo, _, err := collection.getRevSeqNo(ctx, writeKey)
+				require.NoError(t, err)
 
 				_, rawBucketDoc, err := collection.GetDocumentWithRaw(ctx, writeKey, DocUnmarshalSync)
 				require.NoError(t, err)
@@ -172,7 +176,7 @@ func TestOnDemandImportMou(t *testing.T) {
 					require.NoError(t, base.JSONUnmarshal(mouXattr, &mou))
 					require.Equal(t, base.CasToString(writeCas), mou.PreviousHexCAS)
 					require.Equal(t, base.CasToString(importCas), mou.HexCAS)
-					require.Equal(t, uint64(1), mou.PreviousRevSeqNo)
+					require.Equal(t, startingRevSeqNo, mou.PreviousRevSeqNo)
 				} else {
 					// expect not found fetching mou xattr
 					require.Error(t, err)

diff --git a/rest/importtest/import_test.go b/rest/importtest/import_test.go
@@ -623,10 +623,8 @@ func TestXattrImportMultipleActorOnDemandGet(t *testing.T) {
 	revId, ok := body[db.BodyRev].(string)
 	assert.True(t, ok, "No rev included in response")
 
-	xattrs, cas, err := dataStore.GetXattrs(rt.Context(), mobileKey, []string{base.MouXattrName, base.VirtualXattrRevSeqNo})
+	_, cas, err := dataStore.GetXattrs(rt.Context(), mobileKey, []string{base.MouXattrName, base.VirtualXattrRevSeqNo})
 	require.NoError(t, err)
-	require.Equal(t, uint64(2), db.RetrieveDocRevSeqNo(t, xattrs[base.VirtualXattrRevSeqNo]))
-	require.Equal(t, uint64(1), getMou(t, xattrs[base.MouXattrName]).PreviousRevSeqNo)
 
 	// Modify the document via the SDK to add a new, non-mobile xattr
 	xattrVal := make(map[string]interface{})