Bug 1128099 - Install marionette packages
--- 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):
"""