diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2019-09-30 01:36:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-09-30 01:36:32 +0000 |
| commit | 2e3c27b74a903f647ed4e4bdd51d945c135fea01 (patch) | |
| tree | 6e87b4be7b658cc26e5dd0c99bf782e5e8cd3abd | |
| parent | fd1b1a22b96725c88428bab6732708d80758decf (diff) | |
| parent | 0dec44e430ce48d95ceb9107fa090ae968f36ba1 (diff) | |
| download | tradefederation-2e3c27b74a903f647ed4e4bdd51d945c135fea01.tar.gz | |
Merge "Report per-attempts elapsed time"
| -rw-r--r-- | src/com/android/tradefed/testtype/suite/ModuleDefinition.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java index 9379170bb..385e06ae6 100644 --- a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java +++ b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java @@ -598,7 +598,9 @@ public class ModuleDefinition implements Comparable<ModuleDefinition>, ITestColl long elapsedTime = 0l; HashMap<String, Metric> metricsProto = new HashMap<>(); if (attempt != null) { - listener.testRunStarted(getId(), totalExpectedTests, attempt, mStartTestTime); + long startTime = + listResults.isEmpty() ? mStartTestTime : listResults.get(0).getStartTime(); + listener.testRunStarted(getId(), totalExpectedTests, attempt, startTime); } else { listener.testRunStarted(getId(), totalExpectedTests, 0, mStartTestTime); } @@ -663,7 +665,12 @@ public class ModuleDefinition implements Comparable<ModuleDefinition>, ITestColl ((ILogSaverListener) listener).logAssociation(logFile.getKey(), logFile.getValue()); } } - listener.testRunEnded(getCurrentTime() - mStartTestTime, metricsProto); + // Allow each attempt to have its own start/end time + if (attempt != null) { + listener.testRunEnded(elapsedTime, metricsProto); + } else { + listener.testRunEnded(getCurrentTime() - mStartTestTime, metricsProto); + } } private void forwardTestResults( |