As written, the integration test depends on being able to shut down and restart Places with a different database multiple times in the same process. This is complicated to get right. Assuming that's the way to go, we can make Places restartable and land this. If not, we'll need to think of a different strategy.

Comment on attachment 8849679 [details] Bug 1343093 - Add integration test for bookmark repair. https://reviewboard.mozilla.org/r/122452/#review124728 Awesome, thanks!

Pushed by kcambridge@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/b88f35ad48cc Add integration test for bookmark repair. r=markh

Comment on attachment 8849679 [details] Bug 1343093 - Add integration test for bookmark repair. This is a test-only change, but the new test uncovered a bug in the clients engine, so filing a request instead of "a=testonly". Approval Request Comment [Feature/Bug causing the regression]: Bug 1317223. [User impact if declined]: No user impact. This is a new test for bookmarks repair, with a bug fix for a path that the previous test didn't catch. [Is this code covered by automated tests?]: Yes. [Has the fix been verified in Nightly?]: N/A [Needs manual test from QE? If yes, steps to reproduce]: No. [List of other uplifts needed for the feature/fix]: None. [Is the change risky?]: Very low risk. [Why is the change risky/not risky?]: Test-only change. [String changes made/needed]: None.

Comment on attachment 8849679 [details] Bug 1343093 - Add integration test for bookmark repair. Improve the test coverage for bookmark repair. Aurora54+.

seems this needs rebasing grafting 406699:b88f35ad48cc "Bug 1343093 - Add integration test for bookmark repair. r=markh" merging services/sync/modules/engines/clients.js merging services/sync/tests/unit/test_bookmark_repair.js warning: conflicts while merging services/sync/tests/unit/test_bookmark_repair.js! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue')