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

Merge "Fix RollbackTest#testBadUpdateRollback"

Browse Source
This commit is contained in:
Zimuzo Ezeozue
2019-02-07 10:47:49 +00:00
committed by Android (Google) Code Review
parent c23b6ee454 753626b42f
commit 3ba176eeb2
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tests/RollbackTest/src/com/android/tests/rollback/RollbackTest.java
View File

@@ -685,7 +685,7 @@ public class RollbackTest {
ActivityManager am = context.getSystemService(ActivityManager.class);
am.killBackgroundProcesses(TEST_APP_A);
// Allow another package launch
crashQueue.offer(intent.getIntExtra("count", 0), 5, TimeUnit.SECONDS);
crashQueue.put(intent.getIntExtra("count", 0));
} catch (InterruptedException e) {
fail("Failed to communicate with test app");
}
@@ -694,14 +694,9 @@ public class RollbackTest {
context.registerReceiver(crashCountReceiver, crashCountFilter);
// Start apps PackageWatchdog#TRIGGER_FAILURE_COUNT times so TEST_APP_A crashes
Integer crashCount = null;
do {
RollbackTestUtils.launchPackage(TEST_APP_A);
crashCount = crashQueue.poll(5, TimeUnit.SECONDS);
if (crashCount == null) {
fail("Timed out waiting for crash signal from test app");
}
} while(crashCount < 5);
} while(crashQueue.take() < 5);
// TEST_APP_A is automatically rolled back by the RollbackPackageHealthObserver
assertEquals(1, RollbackTestUtils.getInstalledVersion(TEST_APP_A));