Right now both files are getting modified within Firefox. That is really not necessary, and the changes should happen on the Python side. The only problem here is that the Python ConfigParser invalidates our ini file by adding spaces around the '=' sign, and doesn't obey capitalization of the keys. This can be done as a follow-up on bug 1129843.

With the upcoming patch on this bug we will be able to get rid of the first restart of Firefox. It means that specifically for Windows we will see the application update logs in the output on Treeherder! It should help us a lot to investigate problems with the update on Windows.

Comment on attachment 8813290 [details] Bug 1142805 - Remove unnecessary restart for update tests https://reviewboard.mozilla.org/r/94734/#review95230

Comment on attachment 8813288 [details] Bug 1142805 - Fix remaining traces for app.update.url.override. https://reviewboard.mozilla.org/r/94730/#review95232

Comment on attachment 8813289 [details] Bug 1142805 - Use ConfigParser to modify update-settings.ini https://reviewboard.mozilla.org/r/94732/#review95234

Comment on attachment 8813287 [details] Bug 1142805 - Set update channel via default branch. https://reviewboard.mozilla.org/r/94728/#review94966

Thank you for the review Rail! As you mentioned on IRC you are not that familiar with the tests yet. So I have also put Maja as a reviewer.

Comment on attachment 8813287 [details] Bug 1142805 - Set update channel via default branch. https://reviewboard.mozilla.org/r/94728/#review95284

Comment on attachment 8813288 [details] Bug 1142805 - Fix remaining traces for app.update.url.override. https://reviewboard.mozilla.org/r/94730/#review95286

Comment on attachment 8813289 [details] Bug 1142805 - Use ConfigParser to modify update-settings.ini https://reviewboard.mozilla.org/r/94732/#review95288

Comment on attachment 8813290 [details] Bug 1142805 - Remove unnecessary restart for update tests https://reviewboard.mozilla.org/r/94734/#review95290

Pushed by hskupin@mozilla.com: https://hg.mozilla.org/integration/autoland/rev/963c437a982d Set update channel via default branch. r=maja_zf,rail https://hg.mozilla.org/integration/autoland/rev/8ec76d7d7458 Fix remaining traces for app.update.url.override. r=maja_zf,rail https://hg.mozilla.org/integration/autoland/rev/68ff0f920107 Use ConfigParser to modify update-settings.ini r=maja_zf,rail https://hg.mozilla.org/integration/autoland/rev/678f4375af23 Remove unnecessary restart for update tests r=maja_zf,rail

https://hg.mozilla.org/mozilla-central/rev/963c437a982d https://hg.mozilla.org/mozilla-central/rev/8ec76d7d7458 https://hg.mozilla.org/mozilla-central/rev/68ff0f920107 https://hg.mozilla.org/mozilla-central/rev/678f4375af23

Looks great for mozilla-central update tests. Lets get this patch uplifted to aurora.

need rebasing for aurora fails like grafting 376953:963c437a982d "Bug 1142805 - Set update channel via default branch. r=maja_zf,rail" merging testing/firefox-ui/harness/firefox_ui_harness/testcases.py warning: conflicts while merging testing/firefox-ui/harness/firefox_ui_harness/testcases.py! (edit, then use 'hg resolve --mark') abort: unresolved conflicts, can't continue (use 'hg resolve' and 'hg graft --continue')

The problem here is that the patch for bug 1316687 is missing on aurora. It means the 2nd commit in this series is not necessary, and others need an update. I wanted to upload a single patch, but I think I will upload all three patches for uplift separately.

Carsten, the patches on this bug are ready for an uplift to aurora. Please pick them in order given their prefix and no merge conflicts should appear. Thanks!

https://hg.mozilla.org/releases/mozilla-aurora/rev/6d00389ced18 https://hg.mozilla.org/releases/mozilla-aurora/rev/4997bfbea525 https://hg.mozilla.org/releases/mozilla-aurora/rev/ccfbf52c6bb3