Merge "Snap for 4890207 from 2f1d7e238478c68c1b7fe70d5d40e87cc34f2b09 to oreo-cts-release" into oreo-cts-release
diff --git a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
index 8a0c5b1..bd0907b 100644
--- a/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
+++ b/src/com/android/tradefed/testtype/suite/ModuleDefinition.java
@@ -231,13 +231,9 @@
if (preparationException != null) {
// For reporting purpose we create a failure placeholder with the error stack
// similar to InitializationError of JUnit.
- TestIdentifier testid = new TestIdentifier(getId(), "PreparationError");
listener.testRunStarted(getId(), 1);
- listener.testStarted(testid);
StringWriter sw = new StringWriter();
preparationException.printStackTrace(new PrintWriter(sw));
- listener.testFailed(testid, sw.toString());
- listener.testEnded(testid, Collections.emptyMap());
listener.testRunFailed(sw.toString());
Map<String, String> metrics = new HashMap<>();
metrics.put(TEST_TIME, "0");
diff --git a/tests/src/com/android/tradefed/testtype/suite/ModuleDefinitionTest.java b/tests/src/com/android/tradefed/testtype/suite/ModuleDefinitionTest.java
index 4a8cf31..5a2eb1e 100644
--- a/tests/src/com/android/tradefed/testtype/suite/ModuleDefinitionTest.java
+++ b/tests/src/com/android/tradefed/testtype/suite/ModuleDefinitionTest.java
@@ -201,9 +201,6 @@
mMockCleaner.tearDown(EasyMock.eq(mMockDevice), EasyMock.eq(mMockBuildInfo),
EasyMock.isNull());
mMockListener.testRunStarted(EasyMock.eq(MODULE_NAME), EasyMock.eq(1));
- mMockListener.testStarted(EasyMock.anyObject());
- mMockListener.testFailed(EasyMock.anyObject(), EasyMock.contains(exceptionMessage));
- mMockListener.testEnded(EasyMock.anyObject(), EasyMock.anyObject());
mMockListener.testRunFailed(EasyMock.contains(exceptionMessage));
mMockListener.testRunEnded(EasyMock.anyLong(), EasyMock.anyObject());
replayMocks();
