Adjust names of some flaky tests excluded from the ART MTS definition.
The following test cases (part of module `CtsLibcoreTestCases`) run in
various client/server configurations and have their actual name
include information about the configuration as a suffix:
- `com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_interrupt_read_withoutAutoClose`
- `com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#test_SSLSocket_setSoWriteTimeout`
Adjust the names of these test cases accordingly.
Test: Rely on ART MTS ATP test runs
Bug: 209958457
Change-Id: I8aca80bedc40e7be221ba17017858c6fddd6d673
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 1898f13..468d92a 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -22,6 +22,7 @@
import argparse
import copy
import collections
+import itertools
import json
import logging
import os
@@ -263,10 +264,19 @@
]
] + [
("CtsLibcoreTestCases" +
- " com.android.org.conscrypt.javax.net.ssl.SSLSocketVersionCompatibilityTest#" + m) for m in [
- "test_SSLSocket_interrupt_read_withoutAutoClose",
- "test_SSLSocket_setSoWriteTimeout",
- ]
+ " 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.android.system.OsTest#" + m) for m in [