Skip to content

Commit b1338a3

Browse files
committed
PR comments
1 parent 52f63ce commit b1338a3

File tree

11 files changed

+328
-405
lines changed

11 files changed

+328
-405
lines changed

gradle-conventions/common/src/main/kotlin/util/JsTarget.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
2+
* Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

55
package util
@@ -40,7 +40,7 @@ fun KotlinJsTargetDsl.configureJsAndWasmJsTasks() {
4040
nodejs {
4141
testTask {
4242
useMocha {
43-
timeout = "10000"
43+
timeout = "100s"
4444
}
4545
}
4646
}

krpc/krpc-test/build.gradle.kts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
* Copyright 2023-2025 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license.
33
*/
44

5+
import com.osacky.doctor.internal.sysProperty
56
import org.jetbrains.kotlin.gradle.dsl.ExplicitApiMode
7+
import org.jetbrains.kotlin.gradle.targets.js.testing.KotlinJsTest
68
import org.jetbrains.kotlin.gradle.targets.jvm.tasks.KotlinJvmTest
79
import util.applyAtomicfuPlugin
810
import java.nio.file.Files
@@ -78,6 +80,14 @@ tasks.named<Delete>("clean") {
7880
delete(resourcesPath.walk().filter { it.isFile && it.extension == tmpExt }.toList())
7981
}
8082

83+
tasks.withType<KotlinJsTest> {
84+
onlyIf {
85+
// for some reason browser tests don't wait for the test to complete and end immediately
86+
// KRPC-166
87+
!targetName.orEmpty().endsWith("browser")
88+
}
89+
}
90+
8191
tasks.register("moveToGold") {
8292
doLast {
8393
resourcesPath.walk().forEach {

0 commit comments

Comments
 (0)