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

Merge pull request #1840 from brave/sync_deps_sorting #1844

Closed
wants to merge 1 commit into from

Conversation

AlexeyBarabash
Copy link
Contributor

Uplift of #1840 into 0.61.x (beta)
This is the last channel I would like to uplift this PR to. Will not uplift to stable to avoid unexpected side-effects.

Fixes brave/brave-browser#3515 .
New sync lib head commit for DEPS is brave/sync@76bf8f1 .

Submitter Checklist:

  • Submitted a ticket for my issue if one did not already exist.
  • Used Github auto-closing keywords in the commit message.
  • Added/updated tests for this change (for new code or code which already has tests).
  • Verified that these changes build without errors on
    • Windows
    • macOS
    • Linux
  • Verified that these changes pass automated tests (npm test brave_unit_tests && npm test brave_browser_tests) on
    • Windows
    • macOS
    • Linux
  • Verified that all lint errors/warnings are resolved (npm run lint) - I see a lot of unrelated warnings.
  • Ran git rebase master (if needed).
  • Ran git rebase -i to squash commits (if needed).
  • Tagged reviewers and labelled the pull request as needed.
  • Request a security/privacy review as needed.
  • Add appropriate QA labels (QA/Yes or QA/No) to include the closed issue in milestone

Test Plan:

The STR from brave/brave-browser#3515

  1. Create sync chain on brave-core device A
  2. Connect to the sync chain device B with code words
  3. On the device A open the following tabs:
    brave://bookmarks/
    https://www.bing.com/search?q=BCA-01&qs=n&form=QBLH&sp=-1&pq=bca-01&sc=8-6&sk=&cvid=4CE2DC7674794F3C89E4F55DE31BBD2A
    https://www.bing.com/search?q=BCA-02&qs=n&form=QBRE&sp=-1&pq=bca-02&sc=8-6&sk=&cvid=DA80C45365A54CF4880E4F853CE72332
    https://www.bing.com/search?q=BCA-03&qs=n&form=QBRE&sp=-1&pq=bca-03&sc=8-6&sk=&cvid=5E00C210D471463EB9ECF64D9EC703DA
  4. On device A bookmark tabs of BCA-01 and BCA-02 as quick as possible
  5. On device B wait until BCA-01 and BCA-02 appear. When this happened as quick as possible, on device A unbookmark BCA-02 tab and bookmark BCA-03 tab
  6. On device B BCA-02 is removed

Reviewer Checklist:

  • New files have MPL-2.0 license header.
  • Request a security/privacy review as needed.
  • Adequate test coverage exists to prevent regressions
  • Verify test plan is specified in PR before merging to source

@AlexeyBarabash AlexeyBarabash added this to the 0.61.x - Beta milestone Mar 5, 2019
@AlexeyBarabash AlexeyBarabash self-assigned this Mar 5, 2019
@AlexeyBarabash AlexeyBarabash requested review from bbondy, kjozwiak, bsclifton, rebron, srirambv and a team and removed request for bbondy, kjozwiak, bsclifton, rebron and srirambv March 5, 2019 20:13
@rebron
Copy link
Collaborator

rebron commented Mar 6, 2019

@AlexeyBarabash Per the uplift-team, we don't want this for 61.x. Let's keep in 62.x for now. Can you go ahead close this one off.

@AlexeyBarabash
Copy link
Contributor Author

@rebron sure, thanks.

@kjozwiak kjozwiak deleted the sync_deps_sorting_0.61.x branch March 6, 2019 19:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants