diff options
| author | Julien Desprez <jdesprez@google.com> | 2024-04-05 08:58:24 -0700 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2024-04-06 01:50:09 +0000 |
| commit | af227103e1f11e0e8fe6d06c6baabceb0d2f1fb3 (patch) | |
| tree | a4174f8db9c8507ab8e83d6c5bf9dda609b5a443 | |
| parent | f9ee2471cecc1c48741db4cd2108252ee10eef28 (diff) | |
| download | tradefederation-af227103e1f11e0e8fe6d06c6baabceb0d2f1fb3.tar.gz | |
Avoid redownloading jars in stageSuite
Test: presubmit
Bug: 319480034
Change-Id: If1f45aee6228b644752a0e32fab80137206c7a02
| -rw-r--r-- | javatests/com/android/tradefed/testtype/suite/ITestSuiteTest.java | 3 | ||||
| -rw-r--r-- | src/com/android/tradefed/testtype/suite/ITestSuite.java | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/javatests/com/android/tradefed/testtype/suite/ITestSuiteTest.java b/javatests/com/android/tradefed/testtype/suite/ITestSuiteTest.java index bf2d3c061..b4fb9e905 100644 --- a/javatests/com/android/tradefed/testtype/suite/ITestSuiteTest.java +++ b/javatests/com/android/tradefed/testtype/suite/ITestSuiteTest.java @@ -1838,7 +1838,8 @@ public class ITestSuiteTest { assertEquals(destDir, testsDir); assertEquals(remoteFilePath, remoteFilePath); assertArrayEquals(new String[] {"/test/"}, includeFilters.toArray()); - assertArrayEquals(new String[] {"[.]config$"}, excludeFilters.toArray()); + assertArrayEquals( + new String[] {"[.]config$", "[.]jar$"}, excludeFilters.toArray()); } }; OptionSetter setter = new OptionSetter(mTestSuite); diff --git a/src/com/android/tradefed/testtype/suite/ITestSuite.java b/src/com/android/tradefed/testtype/suite/ITestSuite.java index a275fb3ab..1344f8f84 100644 --- a/src/com/android/tradefed/testtype/suite/ITestSuite.java +++ b/src/com/android/tradefed/testtype/suite/ITestSuite.java @@ -542,8 +542,8 @@ public abstract class ITestSuite .map(m -> String.format("/%s/", m)) .collect(Collectors.joining("|")); List<String> includeFilters = Arrays.asList(moduleRegex); - // Ignore config file as it's part of config zip artifact that's staged already. - List<String> excludeFilters = Arrays.asList("[.]config$"); + // Ignore config file as it's part of config and jar zip artifact that's staged already. + List<String> excludeFilters = Arrays.asList("[.]config$", "[.]jar$"); if (mStageArtifactsViaFeature) { try (TradefedFeatureClient client = new TradefedFeatureClient()) { Map<String, String> args = new HashMap<>(); @@ -568,7 +568,6 @@ public abstract class ITestSuite .map(p -> p.toString()) .collect(Collectors.joining(";")); args.put(ResolvePartialDownload.REMOTE_PATHS, remotePaths); - args.put("use-cas", "false"); FeatureResponse rep = client.triggerFeature( ResolvePartialDownload.RESOLVE_PARTIAL_DOWNLOAD_FEATURE_NAME, |