From cfdc04be7b1c5ff94810ed24c91b87c796ee5d8e Mon Sep 17 00:00:00 2001
From: shafik <shafik@google.com>
Date: Tue, 2 Jul 2019 11:32:59 +0100
Subject: [PATCH] Uninstall testapps before running SecondaryUserRollbackTest

Add target_preparer for uninstalling TestApp.A and TestApp.B before
running SecondaryUserRollbackTest.
Also, fix the tearDown command after each case to uninstall the right
apps.

Test: atest SecondaryUserRollbackTest ; atest SecondaryUserRollbackTest
Bug: 136538996
Change-Id: I3d5decae03bf9d2f9d78a534399214da05a6d372
---
 tests/RollbackTest/SecondaryUserRollbackTest.xml              | 4 ++++
 .../tests/rollback/host/SecondaryUserRollbackTest.java        | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/RollbackTest/SecondaryUserRollbackTest.xml b/tests/RollbackTest/SecondaryUserRollbackTest.xml
index ad3761018a255..6b3f05c429836 100644
--- a/tests/RollbackTest/SecondaryUserRollbackTest.xml
+++ b/tests/RollbackTest/SecondaryUserRollbackTest.xml
@@ -19,6 +19,10 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="RollbackTest.apk" />
     </target_preparer>
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
+        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.B" />
+    </target_preparer>
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="com.android.tests.rollback.host.SecondaryUserRollbackTest" />
     </test>
diff --git a/tests/RollbackTest/SecondaryUserRollbackTest/src/com/android/tests/rollback/host/SecondaryUserRollbackTest.java b/tests/RollbackTest/SecondaryUserRollbackTest/src/com/android/tests/rollback/host/SecondaryUserRollbackTest.java
index 11fe964229d72..11a0fbb933669 100644
--- a/tests/RollbackTest/SecondaryUserRollbackTest/src/com/android/tests/rollback/host/SecondaryUserRollbackTest.java
+++ b/tests/RollbackTest/SecondaryUserRollbackTest/src/com/android/tests/rollback/host/SecondaryUserRollbackTest.java
@@ -43,8 +43,8 @@ public class SecondaryUserRollbackTest extends BaseHostJUnit4Test {
     @After
     public void tearDown() throws Exception {
         getDevice().switchUser(mOriginalUser);
-        getDevice().executeShellCommand("pm uninstall com.android.tests.rollback.testapp.A");
-        getDevice().executeShellCommand("pm uninstall com.android.tests.rollback.testapp.B");
+        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A");
+        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.B");
         removeSecondaryUserIfNecessary();
     }