Skip to content

Commit 2a2fea3

Browse files
committed
Don't rely on listdir when cleaning up test files
1 parent f6179c1 commit 2a2fea3

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

core/common/test/files/SmokeFileTest.kt

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class SmokeFileTest {
1616
var lastException: Throwable? = null
1717
files.forEach {
1818
try {
19-
it.deleteRecursively()
19+
SystemFileSystem.delete(it, false)
2020
} catch (t: Throwable) {
2121
lastException = t
2222
}
@@ -26,14 +26,6 @@ class SmokeFileTest {
2626
}
2727
}
2828

29-
private fun Path.deleteRecursively() {
30-
val md = SystemFileSystem.metadataOrNull(this) ?: return
31-
if (md.isDirectory) {
32-
SystemFileSystem.list(this).forEach { it.deleteRecursively() }
33-
}
34-
SystemFileSystem.delete(this)
35-
}
36-
3729
private fun createTempPath(): Path {
3830
val f = Path(tempFileName())
3931
files.add(f)
@@ -475,6 +467,10 @@ class SmokeFileTest {
475467
SystemFileSystem.sink(it).close()
476468
}
477469
assertEquals(listOf(file, subdir), SystemFileSystem.list(dir))
470+
471+
SystemFileSystem.delete(file)
472+
SystemFileSystem.delete(Path(subdir, "file"))
473+
SystemFileSystem.delete(subdir)
478474
}
479475

480476
private fun constructAbsolutePath(vararg parts: String): String {

0 commit comments

Comments
 (0)