commit 91861a5e6192bb5bfda18811808da9a83c5dedf2
author Patrik Höglund <phoglund@webrtc.org> Wed Feb 14 07:41:16 2018
committer Commit Bot <commit-bot@chromium.org> Wed Feb 14 08:28:14 2018
tree 19b8720b0606403243225cfea3b083d15fb878d9
parent b8867115a755cf54a75b4123054dae29190441b4

Add .vpython to WebRTC bot isolates.

This ensures that .vpython makes it to our swarm bots. I believe this
will solve a problem where psutil is missing when the catapult devil
forwarder tries to import it.

Our .vpython already specifies psutil as being used by catapult, so
I don't think we need to change anything there.

Bug: None
Change-Id: Iee8a08f22d128bca3fd52f9476604d47efe16652
Reviewed-on: https://webrtc-review.googlesource.com/52940
Reviewed-by: Oleh Prypin <oprypin@webrtc.org>
Commit-Queue: Patrik Höglund <phoglund@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22010}

tools_webrtc/mb/mb.py

diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
index 4db1bc3..f18a059 100755
--- a/tools_webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -1048,7 +1048,7 @@
                                 % (target, test_type), output_path=None)
 
     cmdline = []
-    extra_files = []
+    extra_files = ['../../.vpython']
 
     if test_type == 'script':
       cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])]

tools_webrtc/mb/mb_unittest.py

diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py
index 7c1f1e6..5b41644 100755
--- a/tools_webrtc/mb/mb_unittest.py
+++ b/tools_webrtc/mb/mb_unittest.py
@@ -376,7 +376,7 @@
     files = isolate_file_contents['variables']['files']
     command = isolate_file_contents['variables']['command']
 
-    self.assertEqual(files, ['base_unittests'])
+    self.assertEqual(files, ['../../.vpython', 'base_unittests'])
     self.assertEqual(command, [
         '../../build/android/test_wrapper/logdog_wrapper.py',
         '--target', 'base_unittests',
@@ -409,7 +409,7 @@
     files = isolate_file_contents['variables']['files']
     command = isolate_file_contents['variables']['command']
 
-    self.assertEqual(files, ['base_unittests'])
+    self.assertEqual(files, ['../../.vpython', 'base_unittests'])
     self.assertEqual(command, [
         '../../build/android/test_wrapper/logdog_wrapper.py',
         '--target', 'base_unittests',
@@ -494,6 +494,7 @@
     command = isolate_file_contents['variables']['command']
 
     self.assertEqual(files, [
+        '../../.vpython',
         'base_unittests',
         'base_unittests_script.py',
     ])