commit 3edbfa7378370ba3f4cbc7cf397c83756bc4a399
author Julien Desprez <jdesprez@google.com> Fri Apr 24 10:30:05 2020 -0700
committer Julien Desprez <jdesprez@google.com> Fri Apr 24 10:30:05 2020 -0700
tree 9732312c5f00122f6a5df9fbbcce9f365d5dde4b
parent 42ad8ccd107dce334307c9ccd0e8a34f28e2bba0

Fix auto-retry with local sharding

When we want the granular results from local sharding with
retry, we need to make sure the attempt number is not
overridden

Test: unit tests
Bug: 154932545
Change-Id: I8f9fd07632e02c54715da11694b8f67c5b0f3c0c

src/com/android/tradefed/invoker/InvocationExecution.java

diff --git a/src/com/android/tradefed/invoker/InvocationExecution.java b/src/com/android/tradefed/invoker/InvocationExecution.java
index a1dcecf..78a1efa 100644
--- a/src/com/android/tradefed/invoker/InvocationExecution.java
+++ b/src/com/android/tradefed/invoker/InvocationExecution.java
@@ -42,6 +42,7 @@
 import com.android.tradefed.invoker.logger.InvocationMetricLogger.InvocationMetricKey;
 import com.android.tradefed.invoker.logger.TfObjectTracker;
 import com.android.tradefed.invoker.shard.IShardHelper;
+import com.android.tradefed.invoker.shard.TestsPoolPoller;
 import com.android.tradefed.log.ITestLogger;
 import com.android.tradefed.log.LogUtil.CLog;
 import com.android.tradefed.result.ByteArrayInputStreamSource;
@@ -585,7 +586,9 @@
                 // Handle the no-retry use case
                 if (!decision.isAutoRetryEnabled()
                         || RetryStrategy.NO_RETRY.equals(decision.getRetryStrategy())
-                        || test instanceof ITestSuite) {
+                        || test instanceof ITestSuite
+                        // TODO: Handle auto-retry in local-sharding for non-suite
+                        || test instanceof TestsPoolPoller) {
                     runTest(config, info, listener, test);
                     remainingTests.remove(test);
                     continue;