Bug 1335164 - Install websocketprocessbridge with a more specific test. r=bwc
MozReview-Commit-ID: 2nzpGpiHiDW
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -166,18 +166,18 @@ class AndroidEmulatorTest(BlobUploadMixi
abs_dirs[key] = dirs[key]
self.abs_dirs = abs_dirs
return self.abs_dirs
@PreScriptAction('create-virtualenv')
def _pre_create_virtualenv(self, action):
dirs = self.query_abs_dirs()
requirements = None
- if os.path.isdir(dirs['abs_mochitest_dir']):
- # mochitest is the only thing that needs this
+ if self.test_suite == 'mochitest-media':
+ # mochitest-media is the only thing that needs this
requirements = os.path.join(dirs['abs_mochitest_dir'],
'websocketprocessbridge',
'websocketprocessbridge_requirements.txt')
elif self.test_suite == 'marionette':
requirements = os.path.join(dirs['abs_test_install_dir'],
'config', 'marionette_requirements.txt')
if requirements:
self.register_virtualenv_module(requirements=[requirements],
--- a/testing/mozharness/scripts/desktop_unittest.py
+++ b/testing/mozharness/scripts/desktop_unittest.py
@@ -302,17 +302,17 @@ class DesktopUnittest(TestingMixin, Merc
self.register_virtualenv_module(name='mock')
self.register_virtualenv_module(name='simplejson')
requirements_files = [
os.path.join(dirs['abs_test_install_dir'],
'config',
'marionette_requirements.txt')]
- if os.path.isdir(dirs['abs_mochitest_dir']):
+ if self._query_specified_suites('mochitest') is not None:
# mochitest is the only thing that needs this
requirements_files.append(
os.path.join(dirs['abs_mochitest_dir'],
'websocketprocessbridge',
'websocketprocessbridge_requirements.txt'))
for requirements_file in requirements_files:
self.register_virtualenv_module(requirements=[requirements_file],