Skip to content

[4.1.2 Backport] CBG-5547: fix assertion and log tagging in WaitForPullNoRevMessage (test-only) #8564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bbrks wants to merge 1 commit into from
+2 −3
Open

[4.1.2 Backport] CBG-5547: fix assertion and log tagging in WaitForPullNoRevMessage (test-only) #8564

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions rest/utilities_testing_blip_client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2077,10 +2077,9 @@ func (btcc *BlipTesterCollectionClient) WaitForPullNoRevMessage(docID string, ve
matches = append(matches, m)
}
}
if !assert.NotEmpty(c, matches, "norev message not found for docID %q version %v in pull replication messages", docID, version) {
if !assert.Len(c, matches, 1, "expected exactly one norev message for docID %q version %v in pull replication messages, got %d", docID, version, len(matches)) {
return
}
require.Len(btcc.TB(), matches, 1, "expected exactly one norev message for docID %q version %v, got %d", docID, version, len(matches))
msg = matches[0]
}, 10*time.Second, 5*time.Millisecond, "BlipTesterClient timed out waiting for pull norev message")
return msg
Expand Down Expand Up @@ -2303,7 +2302,7 @@ func (btcc *BlipTesterCollectionClient) addRev(ctx context.Context, docID string
// the raw pull replication message log directly.
if opts.isNoRev && newBody == nil && hasLocalDoc && doc._latestRev(btcc.TB()).body != nil {
require.Equal(btcc.TB(), db.MessageNoRev, opts.msg.Profile(), "only norev messages should hit this bodyless-clobber guard")
base.DebugfCtx(ctx, base.KeySGTest, "Ignoring norev body for docID %q: no body for version %#v", docID, opts.incomingVersion)
base.DebugfCtx(ctx, base.KeySGTest, "Ignoring norev body for docID %s: no body for version %#v", base.UD(docID), opts.incomingVersion)
return
}
newVersion.CV = *updatedHLV.ExtractCurrentVersionFromHLV()
Expand Down