Skip to content
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.

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

Check sync words count to be 24 (direct 1.40.x PR) #13574

Merged
merged 1 commit into from
Jun 7, 2022
Merged

Conversation

AlexeyBarabash
Copy link
Contributor

Resolves brave/brave-browser#23206

Submitter Checklist:

  • I confirm that no security/privacy review is needed, or that I have requested one
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally: npm run test -- brave_browser_tests, npm run test -- brave_unit_tests, npm run lint, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

  1. Take Nightly browser (1.41.x)
  2. Create a sync chain, copy sync code for desktop into clipboard
  3. Take Beta (1.40.x)
  4. Join the sync chain with words from the clipboard
  5. It should give an error message

@AlexeyBarabash AlexeyBarabash requested a review from a team as a code owner June 2, 2022 10:37
@AlexeyBarabash AlexeyBarabash self-assigned this Jun 2, 2022
@AlexeyBarabash AlexeyBarabash requested a review from a team June 2, 2022 10:37
@AlexeyBarabash AlexeyBarabash added this to the 1.40.x - Beta milestone Jun 2, 2022
@AlexeyBarabash
Copy link
Contributor Author

rebased to pass CI

@AlexeyBarabash
Copy link
Contributor Author

rebased again to pass CI

@AlexeyBarabash
Copy link
Contributor Author

Windows CI is unstable https://ci.brave.com/job/pr-brave-browser-fix_23206_1.40.x-windows-x86/3/consoleFull

13:29:30  [1108/1108] BraveSchemeLoadBrowserTest.CrashURLTest (TIMED OUT)
13:29:30  1 test timed out:
13:29:30      BraveSchemeLoadBrowserTest.CrashURLTest (../../brave/browser/brave_scheme_load_browsertest.cc:208)
13:29:30  null

not related to current PR

@kjozwiak
Copy link
Member

kjozwiak commented Jun 7, 2022

Verification PASSED on both Ubuntu 22.04 x64 & Win 11 x64 using the following build that was provided by @AlexeyBarabash:

Brave | 1.40.84 Chromium: 102.0.5005.78 (Developer Build) (64-bit)
--- | ---
Revision | df6dbb5a9fd82af3f567198af2eb5fb4876ef99c-refs/branch-heads/5005_59@{#3}
  • installed 1.40.84 Chromium: 102.0.5005.78 which includes the above fix on both Win 11 x64 & PopOS 22.04 x64
  • generated a sync chain using 1.41.40 Chromium: 102.0.5005.78 which includes the new time-based sync codes
  • ensured that the sync code generated from 1.41.40 Chromium: 102.0.5005.78 couldn't be restored as per the following:
    • ensured that an error message appears when restoring on Win 11 x64 using 1.40.84 Chromium: 102.0.5005.78
    • ensured that an error message appears when restoring on PopOS 22.04 x64 using 1.40.84 Chromium: 102.0.5005.78
Example Example
syncErrorLinux syncErrorWindows

Also ensured that sync codes that are not time-based can still be restored into 1.40.84 Chromium: 102.0.5005.78 without any issues. STR/Cases used:

  • generated a sync chain using 1.39.111 Chromium: 102.0.5005.61 which doesn't have time-based sync backup codes
  • ensured that the sync code generated from 1.39.111 Chromium: 102.0.5005.61 can be restored as per the following:
    • ensured that the PopOS 22.04 x64 device was added into the sync chain without issues
    • ensured that the Win 11 x64 device was added into the sync chain without issues

image

Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Uplift into 1.40.x approved 👍

@kjozwiak kjozwiak merged commit 499502e into 1.40.x Jun 7, 2022
@kjozwiak kjozwiak deleted the fix_23206_1.40.x branch June 7, 2022 02:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants