diff options
| -rw-r--r-- | tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java index dc25384b08e..f10115f0d97 100644 --- a/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java +++ b/tests/rollback/src/com/android/cts/rollback/RollbackManagerTest.java @@ -763,7 +763,7 @@ public class RollbackManagerTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ROLLBACK_LIFETIME) public void testRollbackExpiresWhenLifetimeStays() throws Exception { - long expirationTime = TimeUnit.SECONDS.toMillis(5); + long expirationTime = TimeUnit.SECONDS.toMillis(6); Install.single(TestApp.A1).commit(); Install.single(TestApp.A2).setEnableRollback() .setRollbackLifetimeMillis(expirationTime).commit(); @@ -777,7 +777,7 @@ public class RollbackManagerTest { Thread.sleep(expirationTime / 2); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull(); // The rollback now should expire - Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(1)); + Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(3)); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull(); } finally { // Restore default config values @@ -793,7 +793,7 @@ public class RollbackManagerTest { */ @Test public void testTimeChangeDoesNotAffectLifetime() throws Exception { - long expirationTime = TimeUnit.SECONDS.toMillis(30); + long expirationTime = TimeUnit.SECONDS.toMillis(6); DeviceConfig.setProperty(DeviceConfig.NAMESPACE_ROLLBACK_BOOT, RollbackManager.PROPERTY_ROLLBACK_LIFETIME_MILLIS, Long.toString(expirationTime), false /* makeDefault*/); @@ -811,7 +811,7 @@ public class RollbackManagerTest { Thread.sleep(expirationTime / 2); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull(); // The rollback now should expire - Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(1)); + Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(3)); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull(); } finally { RollbackUtils.forwardTimeBy(-expirationTime); @@ -831,7 +831,7 @@ public class RollbackManagerTest { @Test @RequiresFlagsEnabled(Flags.FLAG_ROLLBACK_LIFETIME) public void testTimeChangeDoesNotAffectLifetimeMillis() throws Exception { - long expirationTime = TimeUnit.SECONDS.toMillis(10); + long expirationTime = TimeUnit.SECONDS.toMillis(6); Install.single(TestApp.A1).commit(); Install.single(TestApp.A2).setEnableRollback() @@ -846,7 +846,7 @@ public class RollbackManagerTest { Thread.sleep(expirationTime / 2); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNotNull(); // The rollback now should expire - Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(1)); + Thread.sleep(expirationTime / 2 + TimeUnit.SECONDS.toMillis(3)); assertThat(RollbackUtils.getAvailableRollback(TestApp.A)).isNull(); } finally { RollbackUtils.forwardTimeBy(-expirationTime); |