From ecd6129fe53047a1da6ef63d06d2d59690baf201 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Wed, 2 Jul 2025 16:58:46 -0700
Subject: [PATCH] Add systemless hosts test

---
 .../java/com/topjohnwu/magisk/test/AdditionalTest.kt     | 6 +++---
 .../main/java/com/topjohnwu/magisk/test/Environment.kt   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

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 46c378799..6ab9e5c2e 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
@@ -55,7 +55,7 @@ class AdditionalTest : BaseTest {
 
     @Test
     fun testModuleCount() {
-        var expected = 2
+        var expected = 3
         if (Environment.mount()) expected++
         if (Environment.preinit()) expected++
         if (Environment.lsposed()) expected++
@@ -90,8 +90,8 @@ class AdditionalTest : BaseTest {
 
         assertNotNull("$MOUNT_TEST is not installed", modules.find { it.id == MOUNT_TEST })
         assertTrue(
-            "/system/etc/newfile should exist",
-            RootUtils.fs.getFile("/system/etc/newfile").exists()
+            "/system/fonts/newfile should exist",
+            RootUtils.fs.getFile("/system/fonts/newfile").exists()
         )
         assertFalse(
             "/system/bin/screenrecord should not exist",
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 d279c6034..1f9458579 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
@@ -98,8 +98,8 @@ class Environment : BaseTest {
         val error = "$MOUNT_TEST setup failed"
         val path = root.getChildFile(MOUNT_TEST)
 
-        // Create /system/etc/newfile
-        val etc = path.getChildFile("system").getChildFile("etc")
+        // Create /system/fonts/newfile
+        val etc = path.getChildFile("system").getChildFile("fonts")
         assertTrue(error, etc.mkdirs())
         assertTrue(error, etc.getChildFile("newfile").createNewFile())
 
@@ -116,6 +116,10 @@ class Environment : BaseTest {
         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) {
         val error = "$SEPOLICY_RULE setup failed"
         val path = root.getChildFile(SEPOLICY_RULE)
@@ -215,6 +219,7 @@ class Environment : BaseTest {
         val root = RootUtils.fs.getFile(Const.MODULE_PATH)
         if (mount()) { setupMountTest(root) }
         if (preinit()) { setupSepolicyRuleModule(root) }
+        setupSystemlessHost()
         setupEmptyZygiskModule(root)
         setupInvalidZygiskModule(root)
         setupRemoveModule(root)