[patch] extending the timeout of the problematic test

robertfmurdock · Oct 5, 2024 · d3da1f3 · d3da1f3
1 parent 89b994c
commit d3da1f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.../digger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/AllContributionTestSpec.kt b/.../digger-test/src/commonMain/kotlin/com/zegreatrob/tools/digger/AllContributionTestSpec.kt
@@ -18,6 +18,7 @@ import kotlin.test.AfterTest
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
+import kotlin.time.Duration.Companion.minutes
 
 interface AllContributionTestSpec : SetupWithOverrides {
     var projectDir: String
@@ -344,7 +345,7 @@ interface AllContributionTestSpec : SetupWithOverrides {
     }
 
     @Test
-    fun willHandleMergeCommitsOnMergedBranchesCorrectly() = runTest {
+    fun willHandleMergeCommitsOnMergedBranchesCorrectly() = runTest(timeout = 5.minutes) {
         setupWithDefaults()
         val gitAdapter = initializeGitRepo(listOf("first"))
         gitAdapter.config("user.name", "Test")

diff --git a/tools/git-test/src/commonMain/kotlin/com/zegreatrob/tools/test/git/GitHelper.kt b/tools/git-test/src/commonMain/kotlin/com/zegreatrob/tools/test/git/GitHelper.kt
@@ -66,7 +66,7 @@ fun GitAdapter.addCommitWithMessage(message: String): CommitRef {
 }
 
 suspend fun delayLongEnoughToAffectGitDate() {
-    withContext(Dispatchers.Unconfined) {
+    withContext(Dispatchers.Default) {
         delay(1.seconds)
     }
 }