commit a4105b9c34bdfb6f041b46f5143ef081dfcb4a44
author Julien Desprez <jdesprez@google.com> Fri Apr 17 17:01:26 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 17 17:01:26 2020 +0000
tree 5dd1bc006bcbe0de46efbcd72d55f04b44df73f0
parent 5e71e7bb71ff761cc7aa0ebfda32dfa189c07e53
parent 7659ab467d8b9a9110b9c985ebca2416bb16c11a

Merge "Ensure the new testFailed interface is aggregated properly"

src/com/android/tradefed/retry/ResultAggregator.java

diff --git a/src/com/android/tradefed/retry/ResultAggregator.java b/src/com/android/tradefed/retry/ResultAggregator.java
index 011fc26..306604c 100644
--- a/src/com/android/tradefed/retry/ResultAggregator.java
+++ b/src/com/android/tradefed/retry/ResultAggregator.java
@@ -250,6 +250,12 @@
     }
 
     @Override
+    public void testFailed(TestDescription test, FailureDescription failure) {
+        super.testFailed(test, failure);
+        mDetailedForwarder.testFailed(test, failure);
+    }
+
+    @Override
     public void testEnded(TestDescription test, long endTime, HashMap<String, Metric> testMetrics) {
         super.testEnded(test, endTime, testMetrics);
         mDetailedForwarder.testEnded(test, endTime, testMetrics);

tests/src/com/android/tradefed/retry/ResultAggregatorTest.java

diff --git a/tests/src/com/android/tradefed/retry/ResultAggregatorTest.java b/tests/src/com/android/tradefed/retry/ResultAggregatorTest.java
index e371896..ce906cc 100644
--- a/tests/src/com/android/tradefed/retry/ResultAggregatorTest.java
+++ b/tests/src/com/android/tradefed/retry/ResultAggregatorTest.java
@@ -122,7 +122,7 @@
                 EasyMock.anyLong(),
                 EasyMock.<HashMap<String, Metric>>anyObject());
         mDetailedListener.testStarted(EasyMock.eq(test2), EasyMock.anyLong());
-        mDetailedListener.testFailed(test2, "I failed. retry me.");
+        mDetailedListener.testFailed(test2, FailureDescription.create("I failed. retry me."));
         mDetailedListener.logAssociation("test2-before-log", test2LogBefore);
         mDetailedListener.logAssociation("test2-after-log", test2LogAfter);
         mDetailedListener.testEnded(
@@ -185,7 +185,7 @@
         mAggregator.testEnded(test1, new HashMap<String, Metric>());
         mAggregator.testStarted(test2);
         mAggregator.logAssociation("test2-before-log", test2LogBefore);
-        mAggregator.testFailed(test2, "I failed. retry me.");
+        mAggregator.testFailed(test2, FailureDescription.create("I failed. retry me."));
         mAggregator.logAssociation("test2-after-log", test2LogAfter);
         mAggregator.testEnded(test2, new HashMap<String, Metric>());
         mAggregator.logAssociation("test-run1-before-log", testRun1LogBefore);