Bug 1128099 - Install marionette packages
authorJonathan Griffin <jgriffin@mozilla.com>
Thu, 19 Mar 2015 12:23:16 -0700 (2015-03-19)
changeset 3785 effeda6b44417e57fd8eebf232c07c60467a0b55
parent 3784 0c2502eda45498896c71e77dde977a9b995b37a3
child 3786 d99684a19ced66b93c5c86d6e7629d5555b6db2d
push id2983
push userjgriffin@mozilla.com
push dateThu, 19 Mar 2015 19:23:34 +0000 (2015-03-19)
bugs1128099
Bug 1128099 - Install marionette packages
scripts/luciddream_unittest.py
--- a/scripts/luciddream_unittest.py
+++ b/scripts/luciddream_unittest.py
@@ -247,17 +247,24 @@ class LuciddreamTest(TestingMixin, Mercu
         if self.config.get('b2gdesktop_url'):
             dirs = self.query_abs_dirs()
             self.mkdir_p(dirs['abs_b2g_desktop'])
             self.b2gdesktop_archive = self.download_file(self.config.get('b2gdesktop_url'),
                                                          parent_dir=dirs['abs_work_dir'])
 
     @PreScriptAction('create-virtualenv')
     def _pre_create_virtualenv(self, action):
-        luciddream_dir = self.query_abs_dirs()['abs_luciddream_dir']
+        dirs = self.query_abs_dirs()
+        requirements = os.path.join(dirs['abs_test_install_dir'],
+                                    'config',
+                                    'marionette_requirements.txt')
+        self.register_virtualenv_module(requirements=[requirements],
+                                        two_pass=True)
+
+        luciddream_dir = dirs['abs_luciddream_dir']
         self.register_virtualenv_module(
             'luciddream',
             url=luciddream_dir,
             requirements=[os.path.join(luciddream_dir, 'requirements.txt')],
         )
 
     def run_tests(self):
         """