From 9e4c242f13ce544fc1b9ae50cbf504e35b00210b Mon Sep 17 00:00:00 2001 From: Osip Fatkullin Date: Thu, 12 Dec 2024 17:17:56 +0100 Subject: [PATCH] Disable mocha timeout --- buildSrc/src/main/kotlin/JsConfig.kt | 17 ++++++++--------- karma/chrome_bin.js | 3 ++- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/buildSrc/src/main/kotlin/JsConfig.kt b/buildSrc/src/main/kotlin/JsConfig.kt index 161e05c452e..e7f5dfe772e 100644 --- a/buildSrc/src/main/kotlin/JsConfig.kt +++ b/buildSrc/src/main/kotlin/JsConfig.kt @@ -2,13 +2,11 @@ * Copyright 2014-2024 JetBrains s.r.o and contributors. Use of this source code is governed by the Apache 2.0 license. */ -import internal.* -import org.gradle.api.* -import org.gradle.internal.extensions.stdlib.* -import org.gradle.kotlin.dsl.* -import org.jetbrains.kotlin.gradle.targets.js.dsl.* -import java.io.* -import kotlin.toString +import internal.capitalized +import internal.libs +import org.gradle.api.Project +import org.gradle.kotlin.dsl.invoke +import org.jetbrains.kotlin.gradle.targets.js.dsl.KotlinJsSubTargetDsl fun Project.configureJs() { kotlin { @@ -34,7 +32,8 @@ fun Project.configureJs() { internal fun KotlinJsSubTargetDsl.useMochaForTests() { testTask { useMocha { - timeout = "10000" + // Disable timeout as we use individual timeouts for tests + timeout = "0" } } } @@ -43,7 +42,7 @@ internal fun KotlinJsSubTargetDsl.useKarmaForTests() { testTask { useKarma { useChromeHeadless() - useConfigDirectory(File(project.rootProject.projectDir, "karma")) + useConfigDirectory(project.rootProject.file("karma")) } } } diff --git a/karma/chrome_bin.js b/karma/chrome_bin.js index edde16b07f1..e8b1926e4e3 100644 --- a/karma/chrome_bin.js +++ b/karma/chrome_bin.js @@ -21,7 +21,8 @@ config.set({ "client": { captureConsole: true, "mocha": { - timeout: 10000 + // Disable timeout as we use individual timeouts for tests + timeout: 0 } } });