From 91861a5e6192bb5bfda18811808da9a83c5dedf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrik=20H=C3=B6glund?= Date: Wed, 14 Feb 2018 08:41:16 +0100 Subject: [PATCH] Add .vpython to WebRTC bot isolates. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Commit-Queue: Patrik Höglund Cr-Commit-Position: refs/heads/master@{#22010} --- tools_webrtc/mb/mb.py | 2 +- tools_webrtc/mb/mb_unittest.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py index 4db1bc39c8..f18a059fd9 100755 --- a/tools_webrtc/mb/mb.py +++ b/tools_webrtc/mb/mb.py @@ -1048,7 +1048,7 @@ class MetaBuildWrapper(object): % (target, test_type), output_path=None) cmdline = [] - extra_files = [] + extra_files = ['../../.vpython'] if test_type == 'script': cmdline = ['../../' + self.ToSrcRelPath(isolate_map[target]['script'])] diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py index 7c1f1e62af..5b41644df3 100755 --- a/tools_webrtc/mb/mb_unittest.py +++ b/tools_webrtc/mb/mb_unittest.py @@ -376,7 +376,7 @@ class UnitTest(unittest.TestCase): 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 @@ class UnitTest(unittest.TestCase): 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 @@ class UnitTest(unittest.TestCase): command = isolate_file_contents['variables']['command'] self.assertEqual(files, [ + '../../.vpython', 'base_unittests', 'base_unittests_script.py', ])