Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eb908a9e authored by JW Wang's avatar JW Wang
Browse files

Wait for rollback becomes available (1/n) 

Sometimes RollbackManager is slow in making rollbacks available.
Let's give it enough time to do the job and make test less flaky.

Bug: 149876119
Test: atest MultiUserRollbackTest

Change-Id: I0a64e2dcde1f5e6dae618cacd6546ad953c1aca7
parent 10cab9d8

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

+1 −6
Original line number Diff line number Diff line
@@ -17,13 +17,11 @@ 
package com.android.tests.rollback;



import static com.android.cts.rollback.lib.RollbackInfoSubject.assertThat;

import static com.android.cts.rollback.lib.RollbackUtils.getUniqueRollbackInfoForPackage;



import static com.google.common.truth.Truth.assertThat;



import android.Manifest;

import android.content.rollback.RollbackInfo;

import android.content.rollback.RollbackManager;



import com.android.cts.install.lib.Install;

import com.android.cts.install.lib.InstallUtils;
@@ -77,13 +75,10 @@ public class MultiUserRollbackTest { 
     */

    @Test

    public void testMultipleUsersUpgradeToV2() throws Exception {

        RollbackManager rm = RollbackUtils.getRollbackManager();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(1);

        Install.single(TestApp.A2).setEnableRollback().commit();

        assertThat(InstallUtils.getInstalledVersion(TestApp.A)).isEqualTo(2);

        RollbackInfo rollback = getUniqueRollbackInfoForPackage(

                rm.getAvailableRollbacks(), TestApp.A);

        assertThat(rollback).isNotNull();

        RollbackInfo rollback = RollbackUtils.waitForAvailableRollback(TestApp.A);

        assertThat(rollback).packagesContainsExactly(

                Rollback.from(TestApp.A2).to(TestApp.A1));

    }