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

Merge "Skip the test if no mainline modules installed" into rvc-dev

Browse Source
This commit is contained in:
JW Wang
2020-04-03 14:37:10 +00:00
committed by Android (Google) Code Review
parent a07da2913d 65a7eeee7b
commit a167a4774a
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/RollbackTest/RollbackTest/src/com/android/tests/rollback/StagedRollbackTest.java
View File

@@ -477,4 +477,12 @@ public class StagedRollbackTest {
StorageManager sm = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE); StorageManager sm = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
assertThat(sm.isCheckpointSupported()).isTrue(); assertThat(sm.isCheckpointSupported()).isTrue();
} }
@Test
public void hasMainlineModule() throws Exception {
String pkgName = getModuleMetadataPackageName();
boolean existed = InstrumentationRegistry.getInstrumentation().getContext()
.getPackageManager().getModuleInfo(pkgName, 0) != null;
assertThat(existed).isTrue();
}
} }

13
tests/RollbackTest/StagedRollbackTest/src/com/android/tests/rollback/host/StagedRollbackTest.java
View File

@@ -243,6 +243,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
*/ */
@Test @Test
public void testRollbackWhitelistedApp() throws Exception { public void testRollbackWhitelistedApp() throws Exception {
assumeTrue(hasMainlineModule());
runPhase("testRollbackWhitelistedApp_Phase1"); runPhase("testRollbackWhitelistedApp_Phase1");
getDevice().reboot(); getDevice().reboot();
runPhase("testRollbackWhitelistedApp_Phase2"); runPhase("testRollbackWhitelistedApp_Phase2");
@@ -460,4 +461,16 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
return false; return false;
} }
} }
/**
* True if this build has mainline modules installed.
*/
private boolean hasMainlineModule() throws Exception {
try {
runPhase("hasMainlineModule");
return true;
} catch (AssertionError ignore) {
return false;
}
}
} }