commit 4f19835e5dbcd7debeea675cff40106907ccf0a4
author Roland Levillain <rpl@google.com> Fri Nov 18 15:38:27 2022 +0000
committer Roland Levillain <rpl@google.com> Sat Nov 19 13:47:39 2022 +0000
tree c5e80a847294494e966b38159b59cf923c23c606
parent 137ed5eb187306a570788b2e798aefc02df06fd2

Handle test excluded from ART MTS uniformly in `regen-test-files`.

Use a `{"<module-name>": ["<test-case-name>", ...]}` dictionary
instead of a plain list to declare flaky tests excluded from ART MTS,
as we already do for tests excluded from MTS (and Mainline
Presubmits).

This is a follow-up to
https://android-review.git.corp.google.com/c/platform/art/+/2306963.

Test: Run `regen-test-files` and check generated files are unchanged
Bug: 167385698
Change-Id: I6cc1b55e3d4338aa9239b342136e74cde66914f0

test/utils/regen-test-files

diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 718b772..ae6527b 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -263,37 +263,37 @@
 
 # Tests exhibiting a flaky behavior, currently exluded from MTS for
 # the stake of stability / confidence (b/209958457).
-flaky_tests_excluded_from_mts = [
-    ("CtsLibcoreFileIOTestCases" +
-     " android.cts.FileChannelInterProcessLockTest#" + m) for m in [
+flaky_tests_excluded_from_mts = {
+    "CtsLibcoreFileIOTestCases": [
+        ("android.cts.FileChannelInterProcessLockTest#" + m) for m in [
          "test_lockJJZ_Exclusive_asyncChannel",
          "test_lockJJZ_Exclusive_syncChannel",
          "test_lock_differentChannelTypes",
          "test_lockJJZ_Shared_asyncChannel",
          "test_lockJJZ_Shared_syncChannel",
+        ]
+    ],
+    "CtsLibcoreTestCases": [
+        ("com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#" + m + c)
+        for (m, c) in itertools.product(
+            [
+                "test_SSLSocket_interrupt_read_withoutAutoClose",
+                "test_SSLSocket_setSoWriteTimeout",
+            ],
+            [
+                "[0: TLSv1.2 client, TLSv1.2 server]",
+                "[1: TLSv1.2 client, TLSv1.3 server]",
+                "[2: TLSv1.3 client, TLSv1.2 server]",
+                "[3: TLSv1.3 client, TLSv1.3 server]",
+            ]
+        )
+    ] + [
+        ("libcore.dalvik.system.DelegateLastClassLoaderTest#" + m) for m in [
+            "testLookupOrderNodelegate_getResource",
+            "testLookupOrder_getResource",
+        ]
     ]
-] + [
-    ("CtsLibcoreTestCases" +
-     " com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#" + m + c)
-    for (m, c) in itertools.product(
-         [
-             "test_SSLSocket_interrupt_read_withoutAutoClose",
-             "test_SSLSocket_setSoWriteTimeout",
-         ],
-         [
-             "[0: TLSv1.2 client, TLSv1.2 server]",
-             "[1: TLSv1.2 client, TLSv1.3 server]",
-             "[2: TLSv1.3 client, TLSv1.2 server]",
-             "[3: TLSv1.3 client, TLSv1.3 server]",
-         ]
-     )
-] + [
-    ("CtsLibcoreTestCases" +
-     " libcore.dalvik.system.DelegateLastClassLoaderTest#" + m) for m in [
-         "testLookupOrderNodelegate_getResource",
-         "testLookupOrder_getResource",
-    ]
-]
+}
 
 # Tests failing because of linking issues, currently exluded from MTS
 # and Mainline Presubmits to minimize noise in continuous runs while
@@ -746,8 +746,9 @@
     # Excluded flaky tests.
     xml_comment = root.createComment(" Excluded flaky tests (b/209958457). ")
     configuration.appendChild(xml_comment)
-    for t in flaky_tests_excluded_from_mts:
-      append_test_exclusion(t)
+    for module in flaky_tests_excluded_from_mts:
+      for testcase in flaky_tests_excluded_from_mts[module]:
+        append_test_exclusion(f"{module} {testcase}")
 
     # Excluded failing tests.
     xml_comment = root.createComment(" Excluded failing tests (b/247108425). ")