Merge "Skip the test if no mainline modules installed" into rvc-dev am: a167a4774a am: f23d9637aa (a2d38dae) · Commits · e / os / android_frameworks_base

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

+8 −0

Original line number	Diff line number	Diff line
		@@ -477,4 +477,12 @@ public class StagedRollbackTest {
		StorageManager sm = (StorageManager) context.getSystemService(Context.STORAGE_SERVICE);
		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 −0

Original line number	Diff line number	Diff line
		@@ -243,6 +243,7 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
		*/
		@Test
		public void testRollbackWhitelistedApp() throws Exception {
		assumeTrue(hasMainlineModule());
		runPhase("testRollbackWhitelistedApp_Phase1");
		getDevice().reboot();
		runPhase("testRollbackWhitelistedApp_Phase2");
		@@ -460,4 +461,16 @@ public class StagedRollbackTest extends BaseHostJUnit4Test {
		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;
		}
		}
		}