From 3542a0e7db7e4b3caaeba617e7ddb69ffc75539b Mon Sep 17 00:00:00 2001 From: "anastasia.katsman" Date: Mon, 23 Jan 2023 13:03:37 +0000 Subject: [PATCH] [rdct-tests]: isDistributedTestMode is defined in one place GitOrigin-RevId: 42d1a13ca8e4c4e52d45b6f5dcac8d0df5a7f1a0 --- .../src/com/intellij/remoteDev/tests/DistributedTestApi.kt | 3 ++- .../remoteDev/tests/impl/DistributedTestHostBase.kt | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/DistributedTestApi.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/DistributedTestApi.kt index d3fb1d625559..1820d1646293 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/DistributedTestApi.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/DistributedTestApi.kt @@ -1,7 +1,8 @@ package com.intellij.remoteDev.tests import com.intellij.openapi.application.Application +import com.intellij.remoteDev.tests.impl.DistributedTestHostBase val Application.isDistributedTestMode by lazy { - System.getenv(AgentConstants.protocolPortEnvVar)?.toIntOrNull() != null + DistributedTestHostBase.getDistributedTestPort() != null } \ No newline at end of file diff --git a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHostBase.kt b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHostBase.kt index 186206683b2f..534e516de3ac 100644 --- a/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHostBase.kt +++ b/platform/remoteDev-util/src/com/intellij/remoteDev/tests/impl/DistributedTestHostBase.kt @@ -63,6 +63,10 @@ abstract class DistributedTestHostBase() { private val logger = Logger.getInstance(DistributedTestHostBase::class.java) const val screenshotOnFailureFileName = "ScreenshotOnFailure" + + fun getDistributedTestPort(): Int? = + (System.getProperty(AgentConstants.protocolPortEnvVar) + ?: System.getenv(AgentConstants.protocolPortEnvVar))?.toIntOrNull() } protected abstract val projectOrNull: Project? @@ -81,8 +85,7 @@ abstract class DistributedTestHostBase() { false -> InetAddress.getLoopbackAddress() } - val port = (System.getProperty(AgentConstants.protocolPortEnvVar) - ?: System.getenv(AgentConstants.protocolPortEnvVar))?.toIntOrNull() + val port = getDistributedTestPort() if (port != null) { logger.info("Queue creating protocol on $hostAddress:$port")