Bug 1230862 - use wptserve in-tree for talos. r=wlach
☠☠ backed out by a4f070f35677 ☠ ☠
authorJulien Pagès <j.parkouss@gmail.com>
Tue, 02 Feb 2016 15:51:41 +0100
changeset 322024 8bbaec3ed0f0bef19cbd9370f1fac92ece43ff18
parent 322023 200da85932e9d4ce3cf44ede8802ba2478a95b7d
child 322025 7add4193c16659e0761fb3012e3380ea414a6e2b
push id1128
push userjlund@mozilla.com
push dateWed, 01 Jun 2016 01:31:59 +0000
treeherdermozilla-release@fe0d30de989d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswlach
bugs1230862
milestone47.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 1230862 - use wptserve in-tree for talos. r=wlach
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -283,39 +283,45 @@ class Talos(TestingMixin, MercurialScrip
         return super(Talos, self).download_and_extract(
             suite_categories=['common', 'talos']
         )
 
     def create_virtualenv(self, **kwargs):
         """VirtualenvMixin.create_virtualenv() assuemes we're using
         self.config['virtualenv_modules']. Since we are installing
         talos from its source, we have to wrap that method here."""
-        # install mozbase first, so we use in-tree versions
+        # require pip >= 1.5 so pip will prefer .whl files to install
+        modules = ['pip>=1.5']
+        # register mozbase and wptserve first, so we use in-tree versions
         if not self.run_local:
+            tests_dir = os.path.join(
+                self.query_abs_dirs()['abs_work_dir'],
+                'tests')
             mozbase_requirements = os.path.join(
-                self.query_abs_dirs()['abs_work_dir'],
-                'tests',
+                tests_dir,
                 'config',
                 'mozbase_requirements.txt'
             )
+            modules.append(os.path.join(tests_dir, 'tools', 'wptserve'))
         else:
+            testing_dir = os.path.dirname(self.talos_path)
             mozbase_requirements = os.path.join(
-                os.path.dirname(self.talos_path),
+                testing_dir,
                 'config',
                 'mozbase_requirements.txt'
             )
+            modules.append(
+                os.path.join(testing_dir,
+                             'web-platform', 'tests', 'tools', 'wptserve'))
         self.register_virtualenv_module(
             requirements=[mozbase_requirements],
             two_pass=True,
             editable=True,
         )
-        # require pip >= 1.5 so pip will prefer .whl files to install
-        super(Talos, self).create_virtualenv(
-            modules=['pip>=1.5']
-        )
+        super(Talos, self).create_virtualenv(modules=modules)
         # talos in harness requires what else is
         # listed in talos requirements.txt file.
         self.install_module(
             requirements=[os.path.join(self.talos_path,
                                        'requirements.txt')]
         )
         # install jsonschema for perfherder validation
         self.install_module(module="jsonschema")