TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-07-30 07:03:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add systemless hosts test

Browse Source
This commit is contained in:
topjohnwu 2025-07-02 16:58:46 -07:00 committed by John Wu
parent 6dfe9df9e2
commit ecd6129fe5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/core/src/main/java/com/topjohnwu/magisk/test/AdditionalTest.kt
View File

@ -55,7 +55,7 @@ class AdditionalTest : BaseTest {
@Test @Test
fun testModuleCount() { fun testModuleCount() {
var expected = 2 var expected = 3
if (Environment.mount()) expected++ if (Environment.mount()) expected++
if (Environment.preinit()) expected++ if (Environment.preinit()) expected++
if (Environment.lsposed()) expected++ if (Environment.lsposed()) expected++
@ -90,8 +90,8 @@ class AdditionalTest : BaseTest {
assertNotNull("$MOUNT_TEST is not installed", modules.find { it.id == MOUNT_TEST }) assertNotNull("$MOUNT_TEST is not installed", modules.find { it.id == MOUNT_TEST })
assertTrue( assertTrue(
"/system/etc/newfile should exist", "/system/fonts/newfile should exist",
RootUtils.fs.getFile("/system/etc/newfile").exists() RootUtils.fs.getFile("/system/fonts/newfile").exists()
) )
assertFalse( assertFalse(
"/system/bin/screenrecord should not exist", "/system/bin/screenrecord should not exist",

9
app/core/src/main/java/com/topjohnwu/magisk/test/Environment.kt
View File

@ -98,8 +98,8 @@ class Environment : BaseTest {
val error = "$MOUNT_TEST setup failed" val error = "$MOUNT_TEST setup failed"
val path = root.getChildFile(MOUNT_TEST) val path = root.getChildFile(MOUNT_TEST)
// Create /system/etc/newfile // Create /system/fonts/newfile
val etc = path.getChildFile("system").getChildFile("etc") val etc = path.getChildFile("system").getChildFile("fonts")
assertTrue(error, etc.mkdirs()) assertTrue(error, etc.mkdirs())
assertTrue(error, etc.getChildFile("newfile").createNewFile()) assertTrue(error, etc.getChildFile("newfile").createNewFile())
@ -116,6 +116,10 @@ class Environment : BaseTest {
assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess) assertTrue(error, Shell.cmd("set_default_perm $path").exec().isSuccess)
} }
private fun setupSystemlessHost() {
assertTrue("hosts setup failed", Shell.cmd("add_hosts_module").exec().isSuccess)
}
private fun setupSepolicyRuleModule(root: ExtendedFile) { private fun setupSepolicyRuleModule(root: ExtendedFile) {
val error = "$SEPOLICY_RULE setup failed" val error = "$SEPOLICY_RULE setup failed"
val path = root.getChildFile(SEPOLICY_RULE) val path = root.getChildFile(SEPOLICY_RULE)
@ -215,6 +219,7 @@ class Environment : BaseTest {
val root = RootUtils.fs.getFile(Const.MODULE_PATH) val root = RootUtils.fs.getFile(Const.MODULE_PATH)
if (mount()) { setupMountTest(root) } if (mount()) { setupMountTest(root) }
if (preinit()) { setupSepolicyRuleModule(root) } if (preinit()) { setupSepolicyRuleModule(root) }
setupSystemlessHost()
setupEmptyZygiskModule(root) setupEmptyZygiskModule(root)
setupInvalidZygiskModule(root) setupInvalidZygiskModule(root)
setupRemoveModule(root) setupRemoveModule(root)