Resolve restore conflicts and tighten smoke cleanup - #2
Open
ivankuznetsov wants to merge 1 commit into
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This removes the branch's conflict with current
mainwhile preserving its corrected warning thatseen,unseen, andmovecan report success for unmatched IDs. Restore's existing section still explains its thread IDs, Trash-only scope, and ID sources.The restore smoke test now registers cleanup before creating its second thread and checks that Trash search returned the disposable threads' IDs before restoring them.
Related: basecamp#186
Validation:
make checkpasses on the rebased result atmain8976f63. Focused race tests and smoke-module compilation pass.git merge-treereports no conflicts and produces the same tree as the tested rebase. A combined binary with thread listing passed a local HTTP-fixture flow through paginated Trash, restore, and listing Trash again.Live HEY smoke validation remains outstanding: the local server at
http://app.hey.localhost:3003is unavailable. No live mailbox was changed.