Merge was backed out due to test failures in test_service_sync_updateEnabledEngines.js: http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291721138.1291722416.16256.gz http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291708115.1291709734.22505.gz http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291710025.1291711344.29001.gz http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291709717.1291711503.29414.gz http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291715407.1291719825.1876.gz http://tinderbox.mozilla.org/showlog.cgi?log=Firefox/1291709411.1291711437.29249.gz

I can reproduce this failure locally on OSX after re-enabling that test.

When we decided not to augment the test suite for the belt-and-braces engine fix, I reverted the test file... which (a) removed my test fixes, as well as the new test I was adding, and (b) removed my force-enable of the test. Of course the test suite then passed, because the tests were disabled. This patch corrects the test.

Comment on attachment 495847 [details] [diff] [review] Fix tests. Really... we'll have to write a crossweave test for this. File a bug on that?

Landed: http://hg.mozilla.org/services/fx-sync/rev/4ca4bccf59e3