Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 15:23:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1321048 - add talos-test option to not download tp5 pageset; r=jmaher

Browse Source 
MozReview-Commit-ID: KtpbABSg40a

--HG--
extra : rebase_source : cb6eece796aa41b03b86dcef503d096fad570fe3
This commit is contained in:
Rob Wood 2016-12-01 11:20:22 -05:00
parent 271c772320
commit 38a04b8138
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
testing/mozharness/mozharness/mozilla/testing/talos.py
View File

@ -326,20 +326,24 @@ class Talos(TestingMixin, MercurialScript, BlobUploadMixin, TooltoolMixin):
self.suite = self.config['suite']
# now that have the suite name, check if pageset is required, if so download it
# the --no-download option will override this
if self.query_pagesets_name():
self.info("Downloading pageset with tooltool...")
self.src_talos_webdir = os.path.join(self.talos_path, 'talos')
src_talos_pageset = os.path.join(self.src_talos_webdir, 'tests')
manifest_file = os.path.join(self.talos_path, 'tp5n-pageset.manifest')
self.tooltool_fetch(
manifest_file,
output_dir=src_talos_pageset,
cache=self.config.get('tooltool_cache')
)
archive = os.path.join(src_talos_pageset, self.pagesets_name)
unzip = self.query_exe('unzip')
unzip_cmd = [unzip, '-q', '-o', archive, '-d', src_talos_pageset]
self.run_command(unzip_cmd, halt_on_failure=True)
if '--no-download' not in self.config['talos_extra_options']:
self.info("Downloading pageset with tooltool...")
self.src_talos_webdir = os.path.join(self.talos_path, 'talos')
src_talos_pageset = os.path.join(self.src_talos_webdir, 'tests')
manifest_file = os.path.join(self.talos_path, 'tp5n-pageset.manifest')
self.tooltool_fetch(
manifest_file,
output_dir=src_talos_pageset,
cache=self.config.get('tooltool_cache')
)
archive = os.path.join(src_talos_pageset, self.pagesets_name)
unzip = self.query_exe('unzip')
unzip_cmd = [unzip, '-q', '-o', archive, '-d', src_talos_pageset]
self.run_command(unzip_cmd, halt_on_failure=True)
else:
self.info("Not downloading pageset because the no-download option was specified")
# Action methods. {{{1
# clobber defined in BaseScript

2
testing/talos/talos/cmdline.py
View File

@ -127,6 +127,8 @@ def create_parser(mach_interface=False):
' the manifest')
add_arg('--tpdelay', type=int,
help="length of the pageloader delay")
add_arg('--no-download', action="store_true", dest="no_download",
help="Do not download the talos test pagesets")
add_arg('--sourcestamp',
help='Specify the hg revision or sourcestamp for the changeset'
' we are testing. This will use the value found in'