Merge "extract cleanup jobs from run method in ModuleDef" into oc-dev
diff --git a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
index 96fe234..f51be93 100644
--- a/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
+++ b/common/host-side/tradefed/src/com/android/compatibility/common/tradefed/testtype/ModuleDef.java
@@ -259,6 +259,13 @@
moduleFinisher.finish();
// Tear down
+ runPreparerTeardowns();
+ }
+
+ /**
+ * Run preparers' teardown functions.
+ */
+ protected void runPreparerTeardowns() throws DeviceNotAvailableException {
for (ITargetCleaner cleaner : mCleaners) {
CLog.d("Cleaner: %s", cleaner.getClass().getSimpleName());
cleaner.tearDown(mDevice, mBuild, null);
@@ -266,7 +273,7 @@
}
/**
- * Run preparer setup functions.
+ * Run preparers' setup functions.
*
* @throws DeviceNotAvailableException
*/