wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1207038 - Backout workaround of bug 1156475 for Marionette shutdown hang. r=maja_zf

Browse Source 
MozReview-Commit-ID: 8ZZGDA09ojo
This commit is contained in:
Henrik Skupin 2016-02-10 01:48:00 +01:00
parent f53e450151
commit 630c588705
2 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
testing/firefox-ui/tests/firefox_ui_tests/update/direct/test_direct_update.py
View File

@ -16,16 +16,6 @@ class TestDirectUpdate(UpdateTestCase):
finally:
UpdateTestCase.tearDown(self)
def _test_update(self):
self.download_and_apply_available_update(force_fallback=False)
self.check_update_applied()
def test_update(self):
try:
self._test_update()
except:
# Switch context to the main browser window before embarking
# down the failure code path to work around bug 1141519.
self.browser.switch_to()
raise
self.download_and_apply_available_update(force_fallback=False)
self.check_update_applied()

17
testing/firefox-ui/tests/firefox_ui_tests/update/fallback/test_fallback_update.py
View File

@ -16,18 +16,7 @@ class TestFallbackUpdate(UpdateTestCase):
finally:
UpdateTestCase.tearDown(self)
def _test_update(self):
self.download_and_apply_available_update(force_fallback=True)
self.download_and_apply_forced_update()
self.check_update_applied()
def test_update(self):
try:
self._test_update()
except:
# Switch context to the main browser window before embarking
# down the failure code path to work around bug 1141519.
self.browser.switch_to()
raise
self.download_and_apply_available_update(force_fallback=True)
self.download_and_apply_forced_update()
self.check_update_applied()