Skip to content

Commit 6f3bb46

Browse files
authored
Fix test timeout while running Dev environment integration tests (#3705)
1 parent 4ba4758 commit 6f3bb46

File tree

3 files changed

+12
-2
lines changed

3 files changed

+12
-2
lines changed

jetbrains-gateway/it/software/aws/toolkits/jetbrains/gateway/DevEnvConnectTest.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ import software.aws.toolkits.core.utils.tryOrNull
4040
import software.aws.toolkits.jetbrains.core.AwsClientManager
4141
import software.aws.toolkits.jetbrains.core.MockClientManager
4242
import software.aws.toolkits.jetbrains.core.credentials.ManagedBearerSsoConnection
43+
import software.aws.toolkits.jetbrains.core.credentials.pinning.CodeCatalystConnection
44+
import software.aws.toolkits.jetbrains.core.credentials.pinning.ConnectionPinningManager
4345
import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_REGION
4446
import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
4547
import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.BearerTokenProvider
@@ -166,6 +168,8 @@ class DevEnvConnectTest : AfterAllCallback {
166168
// can probably abstract this out as an extension
167169
// force auth to complete now
168170
connection = ManagedBearerSsoConnection(SONO_URL, SONO_REGION, listOf("codecatalyst:read_write"))
171+
// pin connection to avoid dialog prompt
172+
ConnectionPinningManager.getInstance().setPinnedConnection(CodeCatalystConnection.getInstance(), connection)
169173
(connection.getConnectionSettings().tokenProvider.delegate as BearerTokenProvider).reauthenticate()
170174

171175
(service<JetBrainsClientDownloaderConfigurationProvider>() as TestJetBrainsClientDownloaderConfigurationProvider).apply {

jetbrains-gateway/src-222-231/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ class CawsGatewayConnectionHandle(
1313
private val envId: String,
1414
private val componentProvider: (GatewayConnectionHandle) -> JComponent
1515
) : GatewayConnectionHandle(lifetime) {
16+
// framework does not call componentProvider in test mode
17+
private val component = componentProvider(this)
18+
1619
override fun customComponentProvider() = DefaultCustomConnectionFrameComponentProvider(getTitle()) {
17-
componentProvider(this)
20+
component
1821
}
1922

2023
override fun getTitle() = message("caws.connection_progress_panel_title", envId)

jetbrains-gateway/src-232+/software/aws/toolkits/jetbrains/gateway/CawsGatewayConnectionHandle.kt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,11 @@ class CawsGatewayConnectionHandle(
1313
private val envId: String,
1414
private val componentProvider: (GatewayConnectionHandle) -> JComponent
1515
) : GatewayConnectionHandle(lifetime) {
16+
// framework does not call componentProvider in test mode
17+
private val component = componentProvider(this)
18+
1619
override fun customComponentProvider(lifetime: Lifetime) = DefaultCustomConnectionFrameComponentProvider(getTitle()) {
17-
componentProvider(this)
20+
component
1821
}
1922

2023
override fun getTitle() = message("caws.connection_progress_panel_title", envId)

0 commit comments

Comments
 (0)