Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ class FrpcController(
entries.keys.toList().forEach(::stop)
scope.cancel()
}

// Await asynchronous process/config cleanup before deleting the owner's directory.
internal suspend fun awaitTermination() { scope.coroutineContext.job.join() }
}

private fun privateFile(directory: File, name: String, text: String): File = File(directory, name).apply {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.powercess.mbrain.remote

import org.junit.Assert.*
import org.junit.Test
import kotlinx.coroutines.runBlocking
import java.io.*
import java.nio.file.Files
import java.util.concurrent.CopyOnWriteArrayList
Expand Down Expand Up @@ -62,7 +63,7 @@ class FrpcControllerTest {
await { processes.none { it.isAlive } && directory.listFiles().orEmpty().isEmpty() }
Thread.sleep(1100)
assertEquals(4, processes.size)
} finally { controller.close(); directory.deleteRecursively() }
} finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() }
}

@Test fun `custom service survives MCP shutdown and endpoint edits restart only its process`() {
Expand Down Expand Up @@ -95,7 +96,7 @@ class FrpcControllerTest {
assertTrue(replacementProcess.isAlive)
controller.close()
await { processes.none { it.isAlive } && directory.listFiles().orEmpty().isEmpty() }
} finally { controller.close(); directory.deleteRecursively() }
} finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() }
}
@Test fun `repeated retries retain one error until connection recovers`() {
val directory = Files.createTempDirectory("frpc-retry-test").toFile()
Expand Down Expand Up @@ -123,7 +124,7 @@ class FrpcControllerTest {
process.line("start proxy success")
await { states[tunnel.id]?.phase == TunnelPhase.CONNECTED }
assertNull(states.getValue(tunnel.id).error)
} finally { controller.close(); directory.deleteRecursively() }
} finally { controller.close(); runBlocking { controller.awaitTermination() }; directory.deleteRecursively() }
}

}
Loading