Merge "Do cleanup before/after running the test" into rvc-dev

tests/RollbackTest/MultiUserRollbackTest.xml

@@ -15,9 +15,6 @@
 -->
 <configuration description="Runs rollback tests for multiple users">
     <option name="test-suite-tag" value="MultiUserRollbackTest" />
-    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
-        <option name="run-command" value="pm uninstall com.android.cts.install.lib.testapp.A" />
-    </target_preparer>
     <test class="com.android.tradefed.testtype.HostTest" >
         <option name="class" value="com.android.tests.rollback.host.MultiUserRollbackTest" />
     </test>

tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java

@@ -40,15 +40,20 @@ public class MultiUserRollbackTest extends BaseHostJUnit4Test {
     private static final long SWITCH_USER_COMPLETED_NUMBER_OF_POLLS = 60;
     private static final long SWITCH_USER_COMPLETED_POLL_INTERVAL_IN_MILLIS = 1000;
 
+    private void cleanUp() throws Exception {
+        getDevice().executeShellCommand("pm rollback-app com.android.cts.install.lib.testapp.A");
+        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A");
+    }
 
     @After
     public void tearDown() throws Exception {
-        getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A");
+        cleanUp();
         removeSecondaryUserIfNecessary();
     }
 
     @Before
     public void setup() throws Exception {
+        cleanUp();
         mOriginalUserId = getDevice().getCurrentUser();
         createAndStartSecondaryUser();
         // TODO(b/149733368): Remove the '-g' workaround when the bug is fixed.