Bug 1299242 - Fix regression with installing requirements in AndroidEmulatorTest; r?gbrown draft
authorMaja Frydrychowicz <mjzffr@gmail.com>
Wed, 31 Aug 2016 12:54:52 -0400
changeset 408104 9282d48b27906e08d41977c9615269a9ecc1e666
parent 406140 000140429082af3830a2f7a61208132a8be43ca6
child 530044 bcde4bc90eeea505fa114596ff969ad392d794c6
push id28145
push usermjzffr@gmail.com
push dateWed, 31 Aug 2016 18:12:43 +0000
reviewersgbrown
bugs1299242, 1284874
milestone51.0a1
Bug 1299242 - Fix regression with installing requirements in AndroidEmulatorTest; r?gbrown Regression introduced in Bug 1284874. MozReview-Commit-ID: LixkZu5OJnH
testing/mozharness/scripts/android_emulator_unittest.py
--- a/testing/mozharness/scripts/android_emulator_unittest.py
+++ b/testing/mozharness/scripts/android_emulator_unittest.py
@@ -165,26 +165,26 @@ class AndroidEmulatorTest(BlobUploadMixi
             if key not in abs_dirs:
                 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
             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],
                                             two_pass=True)
 
     def _launch_emulator(self):
         env = self.query_env()
 
         # Set $LD_LIBRARY_PATH to self.dirs['abs_work_dir'] so that
         # the emulator picks up the symlink to libGL.so.1 that we