Merge "Avoid re-calling testRunFailure if it was called already"

1 files changed, 4 insertions, 1 deletions

diff --git a/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java b/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
index c0f0b313a..5f00853be 100644
--- a/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
+++ b/src/com/android/tradefed/testtype/suite/GranularRetriableTestWrapper.java
@@ -303,7 +303,10 @@ public class GranularRetriableTestWrapper implements IRemoteTest, ITestCollector
             // TODO: See if it's possible to report IReportNotExecuted
             CLog.e("Run in progress was not completed due to:");
             CLog.e(dnae);
-            runListener.testRunFailed(createFromException(dnae));
+            // If it already was marked as failure do not remark it.
+            if (!mMainGranularRunListener.hasLastAttemptFailed()) {
+                runListener.testRunFailed(createFromException(dnae));
+            }
             // Device Not Available Exception are rethrown.
             throw dnae;
         } finally {