Bug 1428049 - [talos] Create a separate mozbase_source_requirements.txt when installing packages from the source dir, r?igoldan draft
authorAndrew Halberstadt <ahalberstadt@mozilla.com>
Thu, 04 Jan 2018 09:58:45 -0500
changeset 715732 6988f0eb88890c92ce6155a160ae900634535aa3
parent 715663 f78a83244fbebe8a469ae3512fce7f638cab7e1f
child 715733 66f9b2ca3d352cf1eb58a3f32c362e722b56a364
child 715735 b2f305547b1f0b682aa2d346ce7104c58760fad5
child 715737 ed18fad3c439d76b19cfc0477ef6f62771ee51d3
child 715739 63bff020688f551c7c33525c9f4566f24eec82a8
push id94236
push userahalberstadt@mozilla.com
push dateThu, 04 Jan 2018 15:05:50 +0000
reviewersigoldan
bugs1428049
milestone59.0a1
Bug 1428049 - [talos] Create a separate mozbase_source_requirements.txt when installing packages from the source dir, r?igoldan This fixes a regression to |mach talos-test| around a missing 'mozterm' dependency. MozReview-Commit-ID: GcfoA4U1fqg
testing/config/mozbase_requirements.txt
testing/config/mozbase_source_requirements.txt
testing/mozharness/mozharness/mozilla/testing/talos.py
--- a/testing/config/mozbase_requirements.txt
+++ b/testing/config/mozbase_requirements.txt
@@ -1,8 +1,10 @@
+../tools/mozterm
+
 ../mozbase/manifestparser
 ../mozbase/mozcrash
 ../mozbase/mozdebug
 ../mozbase/mozdevice
 ../mozbase/mozfile
 ../mozbase/mozhttpd
 ../mozbase/mozinfo
 ../mozbase/mozinstall
@@ -10,10 +12,8 @@
 ../mozbase/mozlog
 ../mozbase/moznetwork
 ../mozbase/mozprocess
 ../mozbase/mozprofile
 ../mozbase/mozrunner
 ../mozbase/mozscreenshot
 ../mozbase/moztest
 ../mozbase/mozversion
-
-../tools/mozterm
new file mode 100644
--- /dev/null
+++ b/testing/config/mozbase_source_requirements.txt
@@ -0,0 +1,19 @@
+../../python/mozterm
+
+../mozbase/manifestparser
+../mozbase/mozcrash
+../mozbase/mozdebug
+../mozbase/mozdevice
+../mozbase/mozfile
+../mozbase/mozhttpd
+../mozbase/mozinfo
+../mozbase/mozinstall
+../mozbase/mozleak
+../mozbase/mozlog
+../mozbase/moznetwork
+../mozbase/mozprocess
+../mozbase/mozprofile
+../mozbase/mozrunner
+../mozbase/mozscreenshot
+../mozbase/moztest
+../mozbase/mozversion
--- a/testing/mozharness/mozharness/mozilla/testing/talos.py
+++ b/testing/mozharness/mozharness/mozilla/testing/talos.py
@@ -573,17 +573,17 @@ class Talos(TestingMixin, MercurialScrip
                 'tests',
                 'config',
                 'mozbase_requirements.txt'
             )
         else:
             mozbase_requirements = os.path.join(
                 os.path.dirname(self.talos_path),
                 'config',
-                'mozbase_requirements.txt'
+                'mozbase_source_requirements.txt'
             )
         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(