cheets_GTS_N should be recognized as CTS test.
Android N and Android P had shared the same GTS test suite until
the last release (7.0r2), but the upstream now stopped updating/releasing
the tests for N. N keeps using the old version and P gets updates;
they become different set of tests and hence the corresponding
autotest tests are split.
N version of the tests are named as cheets_GTS_N that also needs to
be recognized as a CTS variant.
BUG=b:144468270
TEST=cheets_GTS_N.7.0_r2.GtsContacts on veyron_minnie
Change-Id: Ifcbaf20ea34de32a00cafb5810e91c48c3737f05
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1918859
Tested-by: Kazuhiro Inaba <kinaba@chromium.org>
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Rohit Makasana <rohitbm@chromium.org>
Auto-Submit: Kazuhiro Inaba <kinaba@chromium.org>
Commit-Queue: Kazuhiro Inaba <kinaba@chromium.org>
(cherry picked from commit 17511c2ae0d1258fa69651ad970fb6a0b11cbe66)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/1990535
Reviewed-by: Kazuhiro Inaba <kinaba@chromium.org>
diff --git a/lib/constants.py b/lib/constants.py
index a36882a..c6e14a4 100644
--- a/lib/constants.py
+++ b/lib/constants.py
@@ -349,6 +349,7 @@
DEFAULT_CTS_TEST_XML_MAP = {
'cheets_CTS_': 'test_result.xml',
'cheets_GTS.': 'test_result.xml',
+ 'cheets_GTS_': 'test_result.xml',
}
# Google Storage bucket URI to store results in.
DEFAULT_CTS_RESULTS_GSURI = 'gs://chromeos-cts-results/'
diff --git a/lib/cts_helper_unittest.py b/lib/cts_helper_unittest.py
index 31c124b..12244d3 100644
--- a/lib/cts_helper_unittest.py
+++ b/lib/cts_helper_unittest.py
@@ -20,6 +20,7 @@
def testIsCtsTest(self):
self.assertTrue(cts_helper.isCtsTest('cheets_CTS_N.arm.all'))
self.assertTrue(cts_helper.isCtsTest('cheets_CTS_N.x86.all'))
+ self.assertTrue(cts_helper.isCtsTest('cheets_GTS_N.all'))
self.assertTrue(cts_helper.isCtsTest('cheets_GTS.all'))
self.assertFalse(cts_helper.isCtsTest('cheets_GTS'))
self.assertFalse(cts_helper.isCtsTest('cheets_CTS'))