Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change-Id: Ic4602f94a8e50beac24f730fe9ff514a71d8de3c
This commit is contained in:
Automerger Merge Worker
2020-03-04 01:56:30 +00:00
parent 6022285560 dac57a3e53
commit 6243bf3dfe
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/RollbackTest/MultiUserRollbackTest.xml
View File

@@ -15,9 +15,6 @@
--> -->
<configuration description="Runs rollback tests for multiple users"> <configuration description="Runs rollback tests for multiple users">
<option name="test-suite-tag" value="MultiUserRollbackTest" /> <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" > <test class="com.android.tradefed.testtype.HostTest" >
<option name="class" value="com.android.tests.rollback.host.MultiUserRollbackTest" /> <option name="class" value="com.android.tests.rollback.host.MultiUserRollbackTest" />
</test> </test>

7
tests/RollbackTest/MultiUserRollbackTest/src/com/android/tests/rollback/host/MultiUserRollbackTest.java
View File

@@ -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_NUMBER_OF_POLLS = 60;
private static final long SWITCH_USER_COMPLETED_POLL_INTERVAL_IN_MILLIS = 1000; 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 @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
getDevice().executeShellCommand("pm uninstall com.android.cts.install.lib.testapp.A"); cleanUp();
removeSecondaryUserIfNecessary(); removeSecondaryUserIfNecessary();
} }
@Before @Before
public void setup() throws Exception { public void setup() throws Exception {
cleanUp();
mOriginalUserId = getDevice().getCurrentUser(); mOriginalUserId = getDevice().getCurrentUser();
createAndStartSecondaryUser(); createAndStartSecondaryUser();
// TODO(b/149733368): Remove the '-g' workaround when the bug is fixed. // TODO(b/149733368): Remove the '-g' workaround when the bug is fixed.