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

Fix flaky testEnableRollbackTimeoutFailsRollback test

Browse Source 
am: 1d66bf8c48

Change-Id: Id8c792c9a0926fbd7b8e287c6547eb250caca5fb
This commit is contained in:
Richard Uhler
2019-11-25 05:36:13 -08:00
committed by android-build-merger
parent 170a519878 1d66bf8c48
commit 79e8fcb4ae
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1021,6 +1021,7 @@ public class RollbackTest {
Uninstall.packages(TestApp.A); Uninstall.packages(TestApp.A);
Install.single(TestApp.A1).commit(); Install.single(TestApp.A1).commit();
waitForUnavailableRollback(TestApp.A);
// Block the RollbackManager to make extra sure it will not be // Block the RollbackManager to make extra sure it will not be
// able to enable the rollback in time. // able to enable the rollback in time.
@@ -1029,6 +1030,10 @@ public class RollbackTest {
assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2); assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);
// Give plenty of time for RollbackManager to unblock and attempt
// to make the rollback available before asserting that the
// rollback was not made available.
Thread.sleep(TimeUnit.SECONDS.toMillis(2));
assertThat( assertThat(
getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(), TestApp.A)).isNull(); getUniqueRollbackInfoForPackage(rm.getAvailableRollbacks(), TestApp.A)).isNull();
} finally { } finally {