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

Sync clear orders map #1174

Merged
merged 2 commits into from
Dec 22, 2018
Merged

Sync clear orders map #1174

merged 2 commits into from
Dec 22, 2018

Conversation

AlexeyBarabash
Copy link
Contributor

@AlexeyBarabash AlexeyBarabash commented Dec 21, 2018

Fixes brave/brave-browser#2367 .

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
  • 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:

  1. Create sync chain on device 1
  2. Join device 2 and add a bookmark on device 2, gets sync'd to device 1
  3. Import 5000 bookmark HTML file on device 1, wait for a really long time to sync bookmarks into device 2
  4. Expand the very nested folder in bookmarks on device 2, see some bookmarks at a wrong position compare to device 1

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

Copy link
Member

@darkdh darkdh left a comment

Choose a reason for hiding this comment

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

s/OrdersMap/OrderMap/g

@AlexeyBarabash
Copy link
Contributor Author

Done force push of change OrdersMap => OrderMap according to the review.

Copy link
Member

@darkdh darkdh left a comment

Choose a reason for hiding this comment

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

++

@AlexeyBarabash AlexeyBarabash merged commit a11bb37 into master Dec 22, 2018
AlexeyBarabash added a commit that referenced this pull request Dec 24, 2018
@AlexeyBarabash
Copy link
Contributor Author

master: a11bb37
0.60.x: daa3fa0

AlexeyBarabash added a commit that referenced this pull request Dec 27, 2018
@AlexeyBarabash
Copy link
Contributor Author

0.59.x: 085f376

@rebron
Copy link
Collaborator

rebron commented Dec 27, 2018

After deliberating with @kjozwiak, keep this pr in 59.x and uplift-approved. @darkdh don't set the uplift-approved flags, just uplift-requests. We'll get to them quickly. We need to see and control what's getting in during the freeze period.

@darkdh
Copy link
Member

darkdh commented Dec 27, 2018

sorry, I was putting the wrong label. I meant to put uplift-request

@bbondy bbondy added this to the 0.59.x - Beta milestone Jan 14, 2019
@bsclifton bsclifton deleted the sync_clear_orders_map branch January 24, 2019 21:28
@AlexeyBarabash AlexeyBarabash mentioned this pull request Jul 30, 2019
32 tasks
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.

Bookmarks orders sometimes are sent equal for different bookmarks items
4 participants