Bug 1364410 - Fix quantum-pageload test so it runs locally on windows via mach; r=jmaher
authorRob Wood <rwood@mozilla.com>
Mon, 05 Jun 2017 14:51:06 -0400
changeset 362578 9075ff72a3651e2a2f242cb2b89ad2447e2afb8d
parent 362577 de88730802a859cd59e7cddd4c301ed69fd2da2c
child 362579 e5bd43668caaa8dbb97b5709b3af725299e93faf
push id91116
push userkwierso@gmail.com
push dateWed, 07 Jun 2017 00:30:46 +0000
treeherdermozilla-inbound@5801aa478de1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjmaher
bugs1364410
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1364410 - Fix quantum-pageload test so it runs locally on windows via mach; r=jmaher MozReview-Commit-ID: 35IPFDPG0vR
.hgignore
testing/mozharness/mozharness/mozilla/testing/talos.py
testing/talos/mach_commands.py
--- a/.hgignore
+++ b/.hgignore
@@ -131,16 +131,17 @@ GPATH
 ^testing/talos/bin/
 ^testing/talos/include/
 ^testing/talos/lib/
 ^testing/talos/talos/tests/tp5n.zip
 ^testing/talos/talos/tests/tp5n.tar.gz
 ^testing/talos/talos/tests/tp5n
 ^testing/talos/talos/tests/devtools/damp.manifest.develop
 ^talos-venv
+^py3venv
 
 # Ignore files created when running a reftest.
 ^lextab.py$
 
 # tup database
 ^\.tup
 
 # Ignore Visual Studio Code workspace files.
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -570,19 +570,19 @@ class Talos(TestingMixin, MercurialScrip
         self.buildbot_status(parser.worst_tbpl_status,
                              level=parser.worst_log_level)
 
     def fetch_python3(self):
         manifest_file = os.path.join(
             self.talos_path,
             'talos',
             'mitmproxy',
-            self.config['python3_manifest'][self.platform_name()])
+            self.config.get('python3_manifest')[self.platform_name()])
         output_dir = self.query_abs_dirs()['abs_work_dir']
         # Slowdown: The unzipped Python3 installation gets deleted every time
         self.tooltool_fetch(
             manifest_file,
             output_dir=output_dir,
-            cache=self.config['tooltool_cache']
+            cache=self.config.get('tooltool_cache')
         )
         python3_path = os.path.join(output_dir, 'python3.6', 'python')
         self.run_command([python3_path, '--version'], env=self.query_env())
         return python3_path
--- a/testing/talos/mach_commands.py
+++ b/testing/talos/mach_commands.py
@@ -64,16 +64,20 @@ class TalosRunner(MozbuildObject):
             'default_actions': [
                 'populate-webroot',
                 'create-virtualenv',
                 'setup-mitmproxy',
                 'run-tests',
             ],
             'download_tooltool': True,
             'talos_extra_options': ['--develop'] + self.talos_args,
+            'python3_manifest': {
+                'win32': 'python3.manifest',
+                'win64': 'python3_x64.manifest',
+            }
         }
 
     def make_args(self):
         self.args = {
             'config': {},
             'initial_config_file': self.config_file_path,
         }