Backed out changeset ee39b53a33c0 (bug 1304656)
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Tue, 25 Apr 2017 14:51:44 +0200
changeset 396029 c71323755db2d14dacee7c274ef0160aaf5124da
parent 396028 8619db383886e1237486792ff33d5eb331cdec7d
child 396030 a1ff0d20ca0b924f2cb98f9b99dbb884114d7bd7
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1304656
milestone54.0
backs outee39b53a33c0f1c908f4dc0499d71420d1a40974
Backed out changeset ee39b53a33c0 (bug 1304656)
testing/firefox-ui/harness/firefox_ui_harness/testcases.py
--- a/testing/firefox-ui/harness/firefox_ui_harness/testcases.py
+++ b/testing/firefox-ui/harness/firefox_ui_harness/testcases.py
@@ -307,17 +307,17 @@ class UpdateTestCase(PuppeteerMixin, Mar
         finally:
             self.update_status['patch'] = self.patch_info
 
         if force_fallback:
             # Set the downloaded update into failed state
             self.software_update.force_fallback()
 
         # Restart Firefox to apply the downloaded update
-        self.restart(callback=lambda: about_window.deck.apply.button.click())
+        self.restart()
 
     def download_and_apply_forced_update(self):
         self.check_update_not_applied()
 
         # The update wizard dialog opens automatically after the restart but with a short delay
         dialog = Wait(self.marionette, ignored_exceptions=[NoSuchWindowException]).until(
             lambda _: self.puppeteer.windows.switch_to(lambda win: type(win) is UpdateWizardDialog)
         )
@@ -336,36 +336,32 @@ class UpdateTestCase(PuppeteerMixin, Mar
                 self.assertTrue(update_available,
                                 'Available update has been found')
 
                 # Download update and wait until it has been applied
                 self.download_update(about_window)
                 self.wait_for_update_applied(about_window)
 
             finally:
-                self.update_status['patch'] = self.patch_info
+                if about_window:
+                    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,
                                  dialog.wizard.error_patching)
 
                 # Start downloading the fallback update
                 self.download_update(dialog)
 
             finally:
                 self.update_status['patch'] = self.patch_info
 
-            # Restart Firefox to apply the downloaded fallback update
-            self.restart(callback=lambda: dialog.wizard.finish_button.click())
+        # Restart Firefox to apply the update
+        self.restart()
 
     def read_update_log(self):
         """Read the content of the update log file for the last update attempt."""
         path = os.path.join(os.path.dirname(self.software_update.staging_directory),
                             'last-update.log')
         try:
             with open(path, 'rb') as f:
                 return f.read().splitlines()