Merge "AsecTests: Add teardown to tests"

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java b/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java
index e85254d..5aaf13b 100755
--- a/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java
+++ b/tests/AndroidTests/src/com/android/unit_tests/AsecTests.java
@@ -55,6 +55,7 @@ public class AsecTests extends AndroidTestCase {
     void failStr(String errMsg) {
         Log.w(TAG, "errMsg="+errMsg);
     }
+
     void failStr(Exception e) {
         Log.w(TAG, "e.getMessage="+e.getMessage());
         Log.w(TAG, "e="+e);
@@ -67,6 +68,13 @@ public class AsecTests extends AndroidTestCase {
         cleanupContainers();
     }
 
+    @Override
+    protected void tearDown() throws Exception {
+        super.tearDown();
+        if (localLOGV) Log.i(TAG, "Cleaning out old test containers");
+        cleanupContainers();
+    }
+
     private void cleanupContainers() throws RemoteException {
         IMountService ms = getMs();
         String[] containers = ms.getSecureContainerList();