Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 17:25:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1355009 - Harden update tests with better error messages. r=ato

Browse Source 
To ensure better failure messages a refactoring of checks has to be done. It
includes the following changes:

* No further checks for a follow-up (watershed) update. It's not supported
and as such doesn't need assertions (bug 1353717)

* Checks for fallback updates have to be made to ensure that an invalidated
partial/complete update does not cause an upgrade of Firefox during the restart.

MozReview-Commit-ID: CLb0aXoIur2

--HG--
extra : rebase_source : e41f2463cef695f6f9984ea2ee6f7d43196a9138
This commit is contained in:
Henrik Skupin 2017-04-11 13:42:44 +02:00
parent ae75f65631
commit 5e93b9bf5c
1 changed files with 65 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
testing/firefox-ui/harness/firefox_ui_harness/testcases.py
View File

@ -136,50 +136,80 @@ class UpdateTestCase(PuppeteerMixin, MarionetteTestCase):
"""Check that the update has been applied correctly"""
self.update_status['build_post'] = self.software_update.build_info
about_window = self.browser.open_about_window()
try:
# Bug 604364 - We do not support watershed releases yet.
update_available = self.check_for_updates(about_window)
self.assertFalse(update_available,
'Additional update found due to watershed release {}'.format(
self.update_status['build_post']['version']))
# Ensure that the target version is the same or higher. No downgrade
# should have happened.
version_check = self.marionette.execute_script("""
Components.utils.import("resource://gre/modules/Services.jsm");
# The upgraded version should be identical with the version given by
# the update and we shouldn't have run a downgrade
check = self.marionette.execute_script("""
Components.utils.import("resource://gre/modules/Services.jsm");
return Services.vc.compare(arguments[0], arguments[1]);
""", script_args=(self.update_status['build_post']['version'],
self.update_status['build_pre']['version']))
return Services.vc.compare(arguments[0], arguments[1]);
""", script_args=[self.update_status['build_post']['version'],
self.update_status['build_pre']['version']])
self.assertGreaterEqual(version_check, 0,
'A downgrade from version {} to {} is not allowed'.format(
self.update_status['build_pre']['version'],
self.update_status['build_post']['version']))
self.assertGreaterEqual(check, 0,
'The version of the upgraded build is higher or equal')
self.assertNotEqual(self.update_status['build_post']['buildid'],
self.update_status['build_pre']['buildid'],
'The staged update to buildid {} has not been applied'.format(
self.update_status['patch']['buildid']))
# If a target version has been specified, check if it matches the updated build
if self.target_version:
self.assertEqual(self.update_status['build_post']['version'], self.target_version)
self.assertEqual(self.update_status['build_post']['buildid'],
self.update_status['patch']['buildid'],
'Unexpected target buildid after applying the patch, {} != {}'.format(
self.update_status['build_post']['buildid'],
self.update_status['patch']['buildid']))
# The post buildid should be identical with the buildid contained in the patch
self.assertEqual(self.update_status['build_post']['locale'],
self.update_status['build_pre']['locale'],
'Unexpected change of the locale from {} to {}'.format(
self.update_status['build_pre']['locale'],
self.update_status['build_post']['locale']))
self.assertEqual(self.update_status['build_post']['disabled_addons'],
self.update_status['build_pre']['disabled_addons'],
'Application-wide addons have been unexpectedly disabled: {}'.format(
', '.join(set(self.update_status['build_pre']['locale']) -
set(self.update_status['build_post']['locale']))
))
if self.target_version:
self.assertEqual(self.update_status['build_post']['version'],
self.target_version,
'Current target version {} does not match expected version {}'.format(
self.update_status['build_post']['version'], self.target_version))
if self.target_buildid:
self.assertEqual(self.update_status['build_post']['buildid'],
self.update_status['patch']['buildid'])
self.target_buildid,
'Current target buildid {} does not match expected buildid {}'.format(
self.update_status['build_post']['buildid'], self.target_buildid))
# If a target buildid has been specified, check if it matches the updated build
if self.target_buildid:
self.assertEqual(self.update_status['build_post']['buildid'], self.target_buildid)
self.update_status['success'] = True
# An upgrade should not change the builds locale
self.assertEqual(self.update_status['build_post']['locale'],
self.update_status['build_pre']['locale'])
def check_update_not_applied(self):
"""Check that the update has not been applied due to a forced invalidation of the patch"""
build_info = self.software_update.build_info
# Check that no application-wide add-ons have been disabled
self.assertEqual(self.update_status['build_post']['disabled_addons'],
self.update_status['build_pre']['disabled_addons'])
# Ensure that the version has not been changed
version_check = self.marionette.execute_script("""
Components.utils.import("resource://gre/modules/Services.jsm");
self.update_status['success'] = True
return Services.vc.compare(arguments[0], arguments[1]);
""", script_args=(build_info['version'],
self.update_status['build_pre']['version']))
finally:
about_window.close()
self.assertEqual(version_check, 0,
'An update from version {} to {} has been unexpectedly applied'.format(
self.update_status['build_pre']['version'],
build_info['version']))
# Check that the build id of the source build and the current build are identical
self.assertEqual(build_info['buildid'],
self.update_status['build_pre']['buildid'],
'The build id has been unexpectedly changed from {} to {}'.format(
self.update_status['build_pre']['buildid'], build_info['buildid']))
def download_update(self, window, wait_for_finish=True, timeout=TIMEOUT_UPDATE_DOWNLOAD):
""" Download the update patch.
@ -285,6 +315,8 @@ class UpdateTestCase(PuppeteerMixin, MarionetteTestCase):
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)