From 5ba17c387400fbbf6a3d0babc4b4e7bf8fccba32 Mon Sep 17 00:00:00 2001 From: Vitaly Legchilkin Date: Wed, 18 Mar 2026 18:33:23 +0100 Subject: [PATCH] PY-88280 fix PyVirtualEnvTerminalCustomizerTest to use .venv subdirectory The test was looking for the Python binary directly in the temp directory instead of the `.venv` subdirectory where the virtual environment is actually created. Also sort imports alphabetically. (cherry picked from commit 4fba4755f3ee51e866da299e538a53a87c6a68d5) IJ-MR-196794 GitOrigin-RevId: 8f32934772fbf81952e16234354b1f34dd06c9e6 --- .../env/terminal/PyVirtualEnvTerminalCustomizerTest.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt b/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt index 013123719055..913cc5cc4ba1 100644 --- a/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt +++ b/python/python-terminal/tests/com/intellij/python/junit5Tests/env/terminal/PyVirtualEnvTerminalCustomizerTest.kt @@ -15,7 +15,6 @@ import com.intellij.platform.eel.provider.utils.readWholeText import com.intellij.platform.eel.provider.utils.sendWholeText import com.intellij.platform.eel.spawnProcess import com.intellij.python.community.junit5Tests.framework.conda.CondaEnv -import com.jetbrains.python.getOrThrow import com.intellij.python.community.junit5Tests.framework.conda.PyEnvTestCaseWithConda import com.intellij.python.community.junit5Tests.framework.conda.createCondaEnv import com.intellij.python.junit5Tests.framework.env.pySdkFixture @@ -26,6 +25,7 @@ import com.intellij.testFramework.common.timeoutRunBlocking import com.intellij.testFramework.junit5.fixture.moduleFixture import com.intellij.testFramework.junit5.fixture.projectFixture import com.intellij.testFramework.junit5.fixture.tempPathFixture +import com.jetbrains.python.getOrThrow import com.jetbrains.python.sdk.flavors.conda.PyCondaEnv import com.jetbrains.python.sdk.persist import com.jetbrains.python.sdk.pythonSdk @@ -130,8 +130,9 @@ class PyVirtualEnvTerminalCustomizerTest { Pair(Path(sdk.homePath!!), envDir.toRealPath().pathString) } else { - val venv = VirtualEnvReader().findPythonInPythonRoot(tempDirFixture.get())!! - Pair(venv, tempDirFixture.get().name) + val venvDir = tempDirFixture.get().resolve(".venv") + val venv = VirtualEnvReader().findPythonInPythonRoot(venvDir)!! + Pair(venv, venvDir.name) } // binary might be like ~8.3, we need to expand it as venv might report both