Add flake_suppressor_common to testing/run_pytype.py

Re-adding coverage that was temporarily lost while the GPU-specific code was generalized to be usable by Blink. Bug: 1358733 Change-Id: I153bef93aa2d72c838475a7263472876b1a418f4 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3949633 Reviewed-by: Erik Staab <estaab@chromium.org> Commit-Queue: Preethi Mohan <preethim@google.com> Reviewed-by: Brian Sheedy <bsheedy@chromium.org> Cr-Commit-Position: refs/heads/main@{#1058856}
qweri0p · Oct 13, 2022 · 6d478e4 · 6d478e4
1 parent 55b29f2
commit 6d478e4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/testing/BUILD.gn b/testing/BUILD.gn
@@ -61,13 +61,12 @@ group("pytype_dependencies") {
   ]
 }
 
-# Could be changed to "testing_pytype" if type hinting is ever added to other
-# code in the directory.
-group("unexpected_passes_common_pytype") {
+group("testing_pytype") {
   data = [
     "//testing/run_pytype.py",
 
     "//testing/unexpected_passes_common/",
+    "//testing/flake_suppressor_common/",
     "//third_party/catapult/third_party/typ/",
   ]
 

diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
@@ -104786,13 +104786,13 @@
         "test_id_prefix": "ninja://chrome/test:telemetry_unittests/"
       },
       {
-        "isolate_name": "unexpected_passes_common_pytype",
+        "isolate_name": "testing_pytype",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
-        "name": "unexpected_passes_common_pytype",
+        "name": "testing_pytype",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -104808,7 +104808,7 @@
           "expiration": 43200,
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://testing:unexpected_passes_common_pytype/"
+        "test_id_prefix": "ninja://testing:testing_pytype/"
       },
       {
         "args": [

diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
@@ -4028,13 +4028,13 @@
         "test_id_prefix": "ninja://chrome/test:telemetry_unittests/"
       },
       {
-        "isolate_name": "unexpected_passes_common_pytype",
+        "isolate_name": "testing_pytype",
         "isolate_profile_data": true,
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
         },
-        "name": "unexpected_passes_common_pytype",
+        "name": "testing_pytype",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -4048,7 +4048,7 @@
           ],
           "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
         },
-        "test_id_prefix": "ninja://testing:unexpected_passes_common_pytype/"
+        "test_id_prefix": "ninja://testing:testing_pytype/"
       },
       {
         "args": [

diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
@@ -1851,8 +1851,8 @@
     "label": "//ui/touch_selection:ui_touch_selection_unittests",
     "type": "windowed_test_launcher",
   },
-  "unexpected_passes_common_pytype": {
-    "label": "//testing:unexpected_passes_common_pytype",
+  "testing_pytype": {
+    "label": "//testing:testing_pytype",
     "script": "//testing/run_pytype.py",
     "type": "script",
   },

diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
@@ -3426,6 +3426,11 @@
       'linux_optional_gpu_tests_rel',  # crbug.com/1080749
     ],
   },
+  'testing_pytype': {
+    'remove_from': [
+      'linux-code-coverage',
+    ],
+  },
   'trace_test': {
     'remove_from': [
       # Trace tests currently don't work on non-rooted devices due to a private
@@ -3441,11 +3446,6 @@
       },
     },
   },
-  'unexpected_passes_common_pytype': {
-    'remove_from': [
-      'linux-code-coverage',
-    ],
-  },
   'unit_tests': {
     'remove_from': [
       'android-pie-arm64-rel',  # https://crbug.com/1010211

diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
@@ -4277,7 +4277,7 @@
           'has_native_resultdb_integration',
         ],
       },
-      'unexpected_passes_common_pytype': {
+      'testing_pytype': {
         'mixins': [
           'has_native_resultdb_integration',
         ],

diff --git a/testing/run_pytype.py b/testing/run_pytype.py
@@ -22,6 +22,7 @@
 
 FILES_AND_DIRECTORIES_TO_CHECK = [
     'unexpected_passes_common',
+    'flake_suppressor_common',
 ]
 FILES_AND_DIRECTORIES_TO_CHECK = [
     os.path.join(TESTING_DIR, f) for f in FILES_AND_DIRECTORIES_TO_CHECK