Skip to content

Commit 8c5c919

Browse files
authored
Give Rider backend more time to start in tests (#3140)
1 parent 08687af commit 8c5c919

File tree

4 files changed

+12
-0
lines changed

4 files changed

+12
-0
lines changed

jetbrains-rider/tst/base/AwsReuseSolutionTestBase.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ abstract class AwsReuseSolutionTestBase : BaseTestWithSolutionBase() {
7676
GeneralSettings.getInstance().isConfirmExit = false
7777

7878
val params = OpenSolutionParams()
79+
params.backendLoadedTimeout = backendStartTimeout
7980
params.customSolutionName = getCustomSolutionFileName()
8081
params.preprocessTempDirectory = { preprocessTempDirectory(it) }
8182
params.persistCaches = persistCaches

jetbrains-rider/tst/base/RiderTestFrameworkUtils.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ import com.intellij.util.text.SemVer
1212
import com.jetbrains.rider.test.base.PrepareTestEnvironment
1313
import java.io.File
1414
import java.nio.file.Paths
15+
import java.time.Duration
16+
17+
// sometimes Windows Rider tests time out while starting the backend
18+
val backendStartTimeout = Duration.ofMinutes(3)
1519

1620
val versions by lazy {
1721
// would be nice if this were json https://github.com/dotnet/runtime/issues/3049

jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/completion/DotNetHandlerCompletionTest.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,18 @@
44
package software.aws.toolkits.jetbrains.services.lambda.completion
55

66
import base.allowCustomDotnetRoots
7+
import base.backendStartTimeout
78
import com.intellij.openapi.util.IconLoader
89
import com.jetbrains.rd.ide.model.IconModel
910
import com.jetbrains.rider.test.annotations.TestEnvironment
1011
import com.jetbrains.rider.test.base.BaseTestWithSolution
1112
import org.assertj.core.api.Assertions.assertThat
1213
import org.testng.annotations.BeforeSuite
1314
import org.testng.annotations.Test
15+
import java.time.Duration
1416

1517
class DotNetHandlerCompletionTest : BaseTestWithSolution() {
18+
override val backendLoadedTimeout: Duration = backendStartTimeout
1619

1720
override fun getSolutionDirectoryName(): String = ""
1821

jetbrains-rider/tst/software/aws/toolkits/jetbrains/services/lambda/dotnet/LambdaGutterMarkHighlightingTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,23 @@
33

44
package software.aws.toolkits.jetbrains.services.lambda.dotnet
55

6+
import base.backendStartTimeout
67
import com.jetbrains.rdclient.testFramework.waitForDaemon
78
import com.jetbrains.rider.projectView.solution
89
import com.jetbrains.rider.test.base.BaseTestWithMarkup
910
import org.testng.annotations.DataProvider
1011
import org.testng.annotations.Test
1112
import software.aws.toolkits.jetbrains.protocol.awsSettingModel
13+
import java.time.Duration
1214

1315
class LambdaGutterMarkHighlightingTest : BaseTestWithMarkup() {
1416

1517
companion object {
1618
private const val LAMBDA_RUN_MARKER_ATTRIBUTE_ID = "AWS Lambda Run Method Gutter Mark"
1719
}
1820

21+
override val backendLoadedTimeout: Duration = backendStartTimeout
22+
1923
override fun getSolutionDirectoryName(): String = "SamHelloWorldApp"
2024

2125
@Test

0 commit comments

Comments
 (0)