Bug 943008 - Enable tbpl to use tip marionette-client, r=aki
☠☠ backed out by d317d6d1fdc8 ☠ ☠
authorMalini Das <mdas@mozilla.com>
Fri, 29 Nov 2013 09:44:07 -0500
changeset 2159 735c70159fa1f3622f4d5b0c533f2672c2c92a50
parent 2157 3ff9aa2dfea7a16759d5443249a37b1e6f53b887
child 2160 37c9861a34d090791c7631cc21e89c589fa98b6e
child 2161 5e7b7164d07c620c0dac65121915db574e2a3861
child 2162 d317d6d1fdc866b0a42b5c4e29ed03201a105636
push id1529
push usermdas@mozilla.com
push dateFri, 29 Nov 2013 14:44:19 +0000
reviewersaki
bugs943008
Bug 943008 - Enable tbpl to use tip marionette-client, r=aki
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 = {