commit aad4ba102bb04a3367c26e089033d5e3aff76066
author Jeremy Leconte <jleconte@webrtc.org> Tue Nov 23 13:32:09 2021
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Nov 23 13:56:03 2021
tree a7a4288dc4699267eea5055c116ff7bdba13e9e8
parent 45e15e33431a599b3c3e8b95c3491ea59ab6946d

Fix windows bot command line issue.

When wrapping test_env.py command on windows bot, there is an error because the python command is missing.
Adding vpython in the command like it is done on chromium mb.py script fixes the problem.

Bug: b/197492097
Change-Id: I91dbad31549fb29058424ca3b2fb8539c3e8010e
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/238760
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Christoffer Jansson <jansson@google.com>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#35407}

tools_webrtc/mb/mb.py

diff --git a/tools_webrtc/mb/mb.py b/tools_webrtc/mb/mb.py
index bed28e3..c7ede49 100755
--- a/tools_webrtc/mb/mb.py
+++ b/tools_webrtc/mb/mb.py
@@ -907,25 +907,28 @@
             '../../.vpython',
             '../../testing/test_env.py',
         ]
+        vpython_exe = 'vpython'
 
         must_retry = False
         if test_type == 'script':
             cmdline += ['../../' +
                         self.ToSrcRelPath(isolate_map[target]['script'])]
         elif is_android:
-            cmdline += ['../../build/android/test_wrapper/logdog_wrapper.py',
+            cmdline += [vpython_exe,
+                        '../../build/android/test_wrapper/logdog_wrapper.py',
                         '--target', target,
                         '--logdog-bin-cmd', '../../bin/logdog_butler',
                         '--logcat-output-file', '${ISOLATED_OUTDIR}/logcats',
                         '--store-tombstones']
         else:
             if test_type == 'raw':
-                cmdline.append('../../tools_webrtc/flags_compatibility.py')
+                cmdline += [vpython_exe,
+                            '../../tools_webrtc/flags_compatibility.py']
                 extra_files.append('../../tools_webrtc/flags_compatibility.py')
 
             if isolate_map[target].get('use_webcam', False):
-                cmdline.append(
-                    '../../tools_webrtc/ensure_webcam_is_running.py')
+                cmdline += [vpython_exe,
+                            '../../tools_webrtc/ensure_webcam_is_running.py']
                 extra_files.append(
                     '../../tools_webrtc/ensure_webcam_is_running.py')
 
@@ -934,10 +937,10 @@
 
             xvfb = use_x11 and test_type == 'windowed_test_launcher'
             if xvfb:
-                cmdline.append('../../testing/xvfb.py')
+                cmdline += [vpython_exe, '../../testing/xvfb.py']
                 extra_files.append('../../testing/xvfb.py')
             else:
-                cmdline.append('../../testing/test_env.py')
+                cmdline += [vpython_exe, '../../testing/test_env.py']
 
             if test_type != 'raw':
                 extra_files += [

tools_webrtc/mb/mb_unittest.py

diff --git a/tools_webrtc/mb/mb_unittest.py b/tools_webrtc/mb/mb_unittest.py
index 2f0a619..8bb6b56 100755
--- a/tools_webrtc/mb/mb_unittest.py
+++ b/tools_webrtc/mb/mb_unittest.py
@@ -333,6 +333,7 @@
     self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py',
                              'base_unittests'])
     self.assertEqual(command, [
+        'vpython',
         '../../build/android/test_wrapper/logdog_wrapper.py',
         '--target', 'base_unittests',
         '--logdog-bin-cmd', '../../bin/logdog_butler',
@@ -367,6 +368,7 @@
     self.assertEqual(files, ['../../.vpython', '../../testing/test_env.py',
                              'base_unittests'])
     self.assertEqual(command, [
+        'vpython',
         '../../build/android/test_wrapper/logdog_wrapper.py',
         '--target', 'base_unittests',
         '--logdog-bin-cmd', '../../bin/logdog_butler',
@@ -408,6 +410,7 @@
         'base_unittests',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../testing/test_env.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
@@ -489,7 +492,9 @@
         'base_unittests',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../tools_webrtc/flags_compatibility.py',
+        'vpython',
         '../../testing/test_env.py',
         './base_unittests',
         '--asan=0',
@@ -531,6 +536,7 @@
         'base_unittests',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../testing/test_env.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
@@ -582,6 +588,7 @@
         'some_resource_file',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../testing/xvfb.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
@@ -634,6 +641,7 @@
         'unittests.exe',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../testing/test_env.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}\\test_logs',
@@ -681,6 +689,7 @@
         'base_unittests',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../testing/test_env.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',
@@ -732,7 +741,9 @@
         'some_resource_file',
     ])
     self.assertEqual(command, [
+        'vpython',
         '../../tools_webrtc/ensure_webcam_is_running.py',
+        'vpython',
         '../../testing/test_env.py',
         '../../tools_webrtc/gtest-parallel-wrapper.py',
         '--output_dir=${ISOLATED_OUTDIR}/test_logs',