commit ab3d9d4f803044f978b9019e760aeeac8a696747
author Ayaka Kinoshita <oribe@google.com> Fri Jan 24 10:46:09 2025 +0900
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Sun Jan 26 17:27:45 2025 -0800
tree 81c4e04f1e54cb039d045621785af6b76b476ca1
parent 72a73b5d07150a93784a87d396a45247d3f1eb7f

uprev_preview_version_common: Update to handle GTS_13

BUG=b:391482741
TEST=python -m unittest server/cros/tradefed/uprev_preview_version_common_unittest.py

Change-Id: If1560aa34d7cf206762bb880dc45c5aabfb1b8fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/autotest/+/6197435
Reviewed-by: Shao-Chuan Lee <shaochuan@chromium.org>
Commit-Queue: Ayaka Kinoshita <oribe@google.com>
Tested-by: Ayaka Kinoshita <oribe@google.com>

server/cros/tradefed/uprev_preview_version_common.py

diff --git a/server/cros/tradefed/uprev_preview_version_common.py b/server/cros/tradefed/uprev_preview_version_common.py
index a7d6f14..84c705d 100644
--- a/server/cros/tradefed/uprev_preview_version_common.py
+++ b/server/cros/tradefed/uprev_preview_version_common.py
@@ -143,9 +143,15 @@
     Raises:
         ValueError if the file name is invalid.
     """
-    # For now only handle the GTS 12 case. Below will check if the resulting
+    # For now only handle the GTS 12 and 13 case. Below will check if the resulting
     # filename is still invalid.
-    normalized = path.name.replace('(12-15)', '-S')
+    replace_pairs = [
+            ('(12-15)', '-S'),  # GTS_12
+            ('(13-16)', '-T'),  # GTS_13
+    ]
+    normalized = path.name
+    for before, after in replace_pairs:
+        normalized = normalized.replace(before, after)
     m = re.fullmatch(_GTS_FILENAME_PATTERN, normalized)
     if m is None:
         raise ValueError(

server/cros/tradefed/uprev_preview_version_common_unittest.py

diff --git a/server/cros/tradefed/uprev_preview_version_common_unittest.py b/server/cros/tradefed/uprev_preview_version_common_unittest.py
index 4d7a167..1bbed0a 100644
--- a/server/cros/tradefed/uprev_preview_version_common_unittest.py
+++ b/server/cros/tradefed/uprev_preview_version_common_unittest.py
@@ -141,7 +141,7 @@
         version_name = uprev_preview_version_common.get_gts_version_name(path)
         self.assertEqual(version_name, '11-R4-R-Preview4-11561875')
 
-    def test_get_gts_version_name_invalid_format(self):
+    def test_get_gts_version_name_invalid_format_GTS_12(self):
         """Tests if get_gts_version_name normalizes when name is invalid."""
         path = pathlib.Path(
                 '/path/to/android-gts-12-R2(12-15)-Preview8-12281132.zip')
@@ -149,6 +149,14 @@
         version_name = uprev_preview_version_common.get_gts_version_name(path)
         self.assertEqual(version_name, '12-R2-S-Preview8-12281132')
 
+    def test_get_gts_version_name_invalid_format_GTS_13(self):
+        """Tests if get_gts_version_name normalizes when name is invalid."""
+        path = pathlib.Path(
+                '/path/to/android-gts-13-R2(13-16)-Preview8-12281132.zip')
+
+        version_name = uprev_preview_version_common.get_gts_version_name(path)
+        self.assertEqual(version_name, '13-R2-T-Preview8-12281132')
+
     @mock.patch('shutil.copy')
     def test_copy_local_file_to_cache_dir(self, mock_copy):
         local_file = pathlib.Path('/path/to/local_file')