Bug 943008 - use gaia-ui-test's tbpl_requirements.txt file, r=bhearsum
authorMalini Das <mdas@mozilla.com>
Tue, 03 Dec 2013 10:55:00 -0500
changeset 2173 b8168d737be3f6142ca1f93bee7d9a4804ded3e4
parent 2167 59eb12add6eb755def65869401a550479653e11a
child 2174 cff6b4fcedb4ae18d00272dad302ac1ebac4b580
child 2175 744423b7ebbb0c282c484be3fea57778afc3190b
push id1541
push usermdas@mozilla.com
push dateTue, 03 Dec 2013 15:55:11 +0000
reviewersbhearsum
bugs943008
Bug 943008 - use gaia-ui-test's tbpl_requirements.txt file, r=bhearsum
scripts/marionette.py
--- a/scripts/marionette.py
+++ b/scripts/marionette.py
@@ -218,18 +218,20 @@ class MarionetteTest(TestingMixin, Toolt
                     'mozprocess', 'mozrunner'):
                 self.register_virtualenv_module(m, os.path.join(mozbase_dir,
                     m))
 
             self.register_virtualenv_module('marionette', os.path.join('tests',
                 'marionette'))
 
         if self.config.get('gaiatest'):
+            requirements = os.path.join(self.query_abs_dirs()['abs_gaiatest_dir'],
+                                    'tbpl_requirements.txt')
             self.register_virtualenv_module('gaia-ui-tests',
-                url=self.query_abs_dirs()['abs_gaiatest_dir'], method='pip')
+                url=self.query_abs_dirs()['abs_gaiatest_dir'], method='pip', requirements=[requirements])
 
     def pull(self, **kwargs):
         if self.config.get('gaiatest'):
             # clone the gaia dir
             dirs = self.query_abs_dirs()
             dest = dirs['abs_gaia_dir']
 
             repo = {