1447513 - Fix failing TPS test_history_collision.js

Status: RESOLVED FIXED

(Firefox :: Sync, enhancement)

Description

[Thom Chiovoloni [:tcsc] (ex-moco)]

Currently what's happening is that we're failing to acquire the sync lock when we expect, since logging in triggers a sync. We then fail to sync with the WIPE_REMOTE flag, which means our history entries don't have the right guids, and so the tombstone doesn't get applied.

(Note that https://searchfox.org/mozilla-central/source/services/sync/modules/browserid_identity.js#256 also thwarts our attempts to set firstSync somewhat).

This all seems rather problematic, but cleaning up TPS's pile of async spaghetti is a problem for another time, especially given it's just a single failure.

Comment 1

[Thom Chiovoloni [:tcsc] (ex-moco)]

Attachment: Bug 1447513 - Make sure we sync at the start of test_history_collision phase 2

This patch also improves the DumpHistory logging to make it include GUIDs.

Review commit: https://reviewboard.mozilla.org/r/229580/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/229580/

Comment 2

[Mark Hammond [:markh] [:mhammond]]

Comment on attachment 8960834 [details]
Bug 1447513 - Make sure we sync at the start of test_history_collision phase 2

https://reviewboard.mozilla.org/r/229580/#review235334

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/fbc30503b744
Make sure we sync at the start of test_history_collision phase 2 r=markh

Comment 4

[Tiberius Oros[:tiberius_oros]]

https://hg.mozilla.org/mozilla-central/rev/fbc30503b744