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
--- 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(