fix: runtime removal never strands an undeletable leftover (#463)

This commit is contained in:
Kurt Himebauch authored and GitHub committed 2026-10-08 21:39:00 -04:00
1 parent 28da3dcbde
commit d6ba3d27d8
3 files changed
+129 -11

No files matched your search

@@ -16,6 +16,7 @@ class RuntimeRemovalTest {
private lateinit var dir: File
@Before fun setUp() { dir = Files.createTempDirectory("runtime-removal").toFile() }
@After fun tearDown() {
RuntimeFileTree.refuseForTest = null
dir.setWritable(true)
RuntimeFileTree.delete(dir, null)
}
@@ -160,4 +161,40 @@ class RuntimeRemovalTest {
assertTrue(LinuxRuntimeInstaller.beginUninstall(null, root)!!.run(null))
assertNull(LinuxRuntimeInstaller.removalError())
}
@Test fun anEntryTheAppCannotDeleteIsSetAsideInsteadOfStrandingTheRemoval() {
val root = runtime()
File(root, "root/.steampath").writeText("made by su")
RuntimeFileTree.refuseForTest = java.util.function.Predicate { it.fileName.toString() == ".steampath" }
assertTrue(LinuxRuntimeInstaller.beginUninstall(null, root)!!.run(null))
assertNull(LinuxRuntimeInstaller.removalError())
assertFalse(root.exists())
assertFalse(File(dir, "linuxfs.removing").exists())
// Only the undeletable entry and its parents remain, out of the way.
val trash = File(dir, LinuxRuntimeInstaller.TRASH)
assertEquals(listOf(".steampath"), trash.walk().filter { it.isFile }.map { it.name }.toList())
assertEquals(setOf(LinuxRuntimeInstaller.TRASH), dir.list()!!.toSet())
// Once it can be deleted, the next removal clears the trash too.
RuntimeFileTree.refuseForTest = null
assertTrue(LinuxRuntimeInstaller.beginUninstall(null, root)!!.run(null))
assertFalse(trash.exists())
}
@Test fun aStuckQuarantineFromAnEarlierBuildClearsOnTheNextRemoval() {
val pending = File(dir, "linuxfs.removing").apply { File(this, "root").mkdirs() }
File(pending, "root/.steampid").writeText("1")
File(pending, "root/game").writeText("game")
RuntimeFileTree.refuseForTest = java.util.function.Predicate { it.fileName.toString() == ".steampid" }
assertTrue(LinuxRuntimeInstaller.beginUninstall(null, File(dir, "linuxfs"))!!.run(null))
assertFalse(pending.exists())
}
@Test fun deleteWhatCanKeepsGoingPastAnEntryItCannotDelete() {
val root = runtime()
RuntimeFileTree.refuseForTest = java.util.function.Predicate { it.fileName.toString() == "gamescope" }
assertFalse(RuntimeFileTree.deleteWhatCan(root, null))
assertEquals(listOf("gamescope"), root.walk().filter { it.isFile }.map { it.name }.toList())
assertFalse(File(root, "root").exists())
}
}