Support already extracted test_mappings.zip in case of CAS download

Test: presubmit
Bug: 325520295
Change-Id: If0fac443d883c22fce5b45869b502c2d30a2fb3f

1 files changed, 12 insertions, 2 deletions

diff --git a/src/com/android/tradefed/util/testmapping/TestMapping.java b/src/com/android/tradefed/util/testmapping/TestMapping.java
index 13c5bebe1..2199a8abd 100644
--- a/src/com/android/tradefed/util/testmapping/TestMapping.java
+++ b/src/com/android/tradefed/util/testmapping/TestMapping.java
@@ -493,7 +493,15 @@ public class TestMapping {
         } else {
             zipFile = buildInfo.getFile(TEST_MAPPINGS_ZIP);
         }
-        File testMappingsDir = extractTestMappingsZip(zipFile);
+        File testMappingsDir = null;
+        boolean delete = false;
+        // Handle already extracted entry
+        if (zipFile.isDirectory()) {
+            testMappingsDir = zipFile;
+        } else {
+            testMappingsDir = extractTestMappingsZip(zipFile);
+            delete = true;
+        }
         Path testMappingsRootPath = Paths.get(testMappingsDir.getAbsolutePath());
         CLog.d("Relative test mapping paths: %s", mTestMappingRelativePaths);
         try (Stream<Path> stream =
@@ -523,7 +531,9 @@ public class TestMapping {
                             "IO exception (%s) when reading tests from TEST_MAPPING files (%s)",
                             e.getMessage(), testMappingsDir.getAbsolutePath()), e);
         } finally {
-            FileUtil.recursiveDelete(testMappingsDir);
+            if (delete) {
+                FileUtil.recursiveDelete(testMappingsDir);
+            }
         }
         return tests;
     }