Bug 1488468 - Update requirements files for telemetry tests; r=davehunt
authorRaphael Pierzina <rpierzina@mozilla.com>
Fri, 05 Oct 2018 19:16:47 +0000
changeset 495688 b2a9499e2c3e3673ea1fae85d5e7f19481f11ca4
parent 495687 b6f68f56cc7fa528d4f8a1ac1ca7ce7d84948719
child 495689 570a90cadb6711bfe7ec61935eebf1c9a7ee5d72
push id9984
push userffxbld-merge
push dateMon, 15 Oct 2018 21:07:35 +0000
treeherdermozilla-beta@183d27ea8570 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdavehunt
bugs1488468
milestone64.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 1488468 - Update requirements files for telemetry tests; r=davehunt Depends on D7905 Differential Revision: https://phabricator.services.mozilla.com/D7906
testing/config/marionette_source_requirements.txt
testing/config/telemetry_tests_requirements.txt
testing/config/telemetry_tests_source_requirements.txt
testing/mozharness/scripts/telemetry/telemetry_client.py
new file mode 100644
--- /dev/null
+++ b/testing/config/marionette_source_requirements.txt
@@ -0,0 +1,17 @@
+# These dependencies are required for running marionette based tests from a source checkout
+
+-r mozbase_source_requirements.txt
+
+../web-platform/tests/tools/wptserve
+../web-platform/tests/tools/third_party/certifi
+../web-platform/tests/tools/third_party/enum
+../web-platform/tests/tools/third_party/h2
+../web-platform/tests/tools/third_party/hyperframe
+../web-platform/tests/tools/third_party/hpack
+
+../marionette/client
+../marionette/harness
+../marionette/harness/marionette_harness/runner/mixins/browsermob-proxy-py
+
+# Allows to use the Puppeteer page object model for Firefox
+../marionette/puppeteer/firefox/
rename from testing/config/telemetry_tests_requirements.txt
rename to testing/config/telemetry_tests_source_requirements.txt
--- a/testing/config/telemetry_tests_requirements.txt
+++ b/testing/config/telemetry_tests_source_requirements.txt
@@ -1,9 +1,5 @@
--r mozbase_requirements.txt
-
-../marionette/client/
-../marionette/harness/
+# These dependencies are required for running telemetry tests from a source checkout
 
-# Allows to use the Puppeteer page object model for Firefox
-../marionette/puppeteer/firefox/
+-r marionette_source_requirements.txt
 
-../../toolkit/components/telemetry/tests/marionette/harness
\ No newline at end of file
+../../toolkit/components/telemetry/tests/marionette/harness
--- a/testing/mozharness/scripts/telemetry/telemetry_client.py
+++ b/testing/mozharness/scripts/telemetry/telemetry_client.py
@@ -97,19 +97,22 @@ class TelemetryTests(TestingMixin, VCSTo
         self.test_url = self.config.get('test_url')
 
         if not self.test_url and not self.test_packages_url:
             self.fatal(
                 'You must use --test-url, or --test-packages-url')
 
     @PreScriptAction('create-virtualenv')
     def _pre_create_virtualenv(self, action):
-
-        requirements = os.path.join(GECKO_SRCDIR, 'testing',
-                                    'config', 'telemetry_tests_requirements.txt')
+        requirements = os.path.join(
+            GECKO_SRCDIR,
+            'testing',
+            'config',
+            'telemetry_tests_source_requirements.txt',
+        )
         self.register_virtualenv_module(requirements=[requirements], two_pass=True)
 
     def query_abs_dirs(self):
         if self.abs_dirs:
             return self.abs_dirs
 
         abs_dirs = super(TelemetryTests, self).query_abs_dirs()