commit a657331e90e23e289e85a92af49b64829151f403
author Takuto Ikuta <tikuta@chromium.org> Thu Jan 20 00:24:57 2022 +0000
committer LUCI CQ <infra-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu Jan 20 00:24:57 2022 +0000
tree 89a3979e77a325c475e4f52917d36150ee0cf2fd
parent b674278ce71b2ee683b8b0c98c9a64152988ecdb

ninjalog_uploader: use goma_auth to detect googler

Bug: 1288639
Change-Id: I447e2f66603ffb8d68599dcf22023fd7857dc4fd
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3400398
Reviewed-by: Fumitoshi Ukai <ukai@google.com>
Reviewed-by: Josip Sokcevic <sokcevic@google.com>
Commit-Queue: Takuto Ikuta <tikuta@chromium.org>

PRESUBMIT.py

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 58ef96c..ef1c987 100644
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -112,22 +112,36 @@
       'recipes_test.py',
   ]
 
+  py3_only_tests = ['ninjalog_uploader_test.py']
+
   tests = input_api.canned_checks.GetUnitTestsInDirectory(
       input_api,
       output_api,
       'tests',
       files_to_check=test_to_run_list,
-      files_to_skip=tests_to_skip_list + py2_only_tests,
+      files_to_skip=tests_to_skip_list + py2_only_tests + py3_only_tests,
       run_on_python3=True)
 
   # TODO: once py3 compatbile, remove those tests
-  tests.extend(input_api.canned_checks.GetUnitTestsInDirectory(
-      input_api,
-      output_api,
-      'tests',
-      files_to_check=py2_only_tests,
-      files_to_skip=tests_to_skip_list,
-      run_on_python3=False))
+  tests.extend(
+      input_api.canned_checks.GetUnitTestsInDirectory(
+          input_api,
+          output_api,
+          'tests',
+          files_to_check=py2_only_tests,
+          files_to_skip=tests_to_skip_list,
+          run_on_python3=False))
+
+  # TODO: use this for all tests when py2 support is dropped.
+  tests.extend(
+      input_api.canned_checks.GetUnitTestsInDirectory(
+          input_api,
+          output_api,
+          'tests',
+          files_to_check=py3_only_tests,
+          files_to_skip=tests_to_skip_list,
+          run_on_python3=True,
+          run_on_python2=False))
 
   return input_api.RunTests(tests)
 
@@ -177,4 +191,3 @@
 
 def CheckDoNotSubmitOnCommit(input_api, output_api):
   return input_api.canned_checks.CheckDoNotSubmit(input_api, output_api)
-