Bug 1304656 - Firefox UI update tests have to use the restart buttons. r=rail

To ensure that we correctly restart Firefox for update tests, the restart
button in the about window or the old software update window have to be
clicked.

MozReview-Commit-ID: 7acl1DcA85d

--HG--
extra : rebase_source : 8af6c300ae34befc2c05e801ea4b5901659c1c2a

testing/firefox-ui/harness/firefox_ui_harness/testcases.py

@@ -312,7 +312,7 @@ class UpdateTestCase(PuppeteerMixin, MarionetteTestCase):
             self.software_update.force_fallback()
 
         # Restart Firefox to apply the downloaded update
-        self.restart()
+        self.restart(callback=lambda: about_window.deck.apply.button.click())
 
     def download_and_apply_forced_update(self):
         self.check_update_not_applied()
@@ -341,9 +341,13 @@ class UpdateTestCase(PuppeteerMixin, MarionetteTestCase):
                 self.wait_for_update_applied(about_window)
 
             finally:
-                if about_window:
-                    self.update_status['patch'] = self.patch_info
+                self.update_status['patch'] = self.patch_info
 
+            # Restart Firefox to apply the downloaded fallback update
+            self.assertIsNotNone(about_window)
+            self.restart(callback=lambda: about_window.deck.apply.button.click())
+
+        # For a broken partial update, the software update window is used
         else:
             try:
                 self.assertEqual(dialog.wizard.selected_panel,
@@ -355,8 +359,8 @@ class UpdateTestCase(PuppeteerMixin, MarionetteTestCase):
             finally:
                 self.update_status['patch'] = self.patch_info
 
-        # Restart Firefox to apply the update
-        self.restart()
+            # Restart Firefox to apply the downloaded fallback update
+            self.restart(callback=lambda: dialog.wizard.finish_button.click())
 
     def read_update_log(self):
         """Read the content of the update log file for the last update attempt."""