diff --git a/app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt b/app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt index 7cf47581b..ad22abc3e 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt @@ -49,7 +49,8 @@ class AdditionalTest : BaseTest { @Test fun testModuleCount() { - var expected = 2 + var expected = 0 + if (Environment.testModules()) expected +=2 if (Environment.lsposed()) expected++ if (Environment.shamiko()) expected++ assertEquals("Module count incorrect", expected, modules.size) @@ -78,6 +79,8 @@ class AdditionalTest : BaseTest { @Test fun testModule01() { + assumeTrue(Environment.testModules()) + val module = modules.find { it.id == "test_01" } assertNotNull("test_01 is not installed", module) assertTrue( @@ -94,6 +97,8 @@ class AdditionalTest : BaseTest { @Test fun testModule02() { + assumeTrue(Environment.testModules()) + val module = modules.find { it.id == "test_02" } assertNotNull("test_02 is not installed", module) module!! @@ -102,6 +107,8 @@ class AdditionalTest : BaseTest { @Test fun testModule03() { + assumeTrue(Environment.testModules()) + assertNull("test_03 should be removed", modules.find { it.id == "test_03" }) } } diff --git a/app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt b/app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt index a4147fec3..c673b3415 100644 --- a/app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt +++ b/app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt @@ -38,8 +38,14 @@ class Environment : BaseTest { @JvmStatic fun before() = BaseTest.prerequisite() + // The kernel running on emulators < API 26 does not play well with + // magic mount. Skip module tests on those legacy platforms. + fun testModules(): Boolean { + return Build.VERSION.SDK_INT >= 26 + } + fun lsposed(): Boolean { - return Build.VERSION.SDK_INT >= 27 && Build.VERSION.SDK_INT <= 34 + return Build.VERSION.SDK_INT in 27..34 } fun shamiko(): Boolean { @@ -169,10 +175,12 @@ class Environment : BaseTest { } } - val root = RootUtils.fs.getFile(Const.MODULE_PATH) - setupModule01(root) - setupModule02(root) - setupModule03(root) + if (testModules()) { + val root = RootUtils.fs.getFile(Const.MODULE_PATH) + setupModule01(root) + setupModule02(root) + setupModule03(root) + } } @Test