MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Python: decouple test-env from UsefulTestCase because it overwrites logger and breaks RD tests

Browse Source 
GitOrigin-RevId: 00aac829d9f2e6d0e71f9cf0dd510c73519c7e85
This commit is contained in:
Ilya.Kazakevich
2025-02-19 21:27:25 +00:00
committed by intellij-monorepo-bot
parent d066a2f02d
commit 967fd16ddb
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/setup-test-environment/intellij.python.community.testFramework.testEnv.iml
+1 -1
View File
@@ -10,10 +10,10 @@
<orderEntry type="library" name="kotlin-stdlib" level="project" />
<orderEntry type="module" module-name="intellij.platform.util" />
<orderEntry type="module" module-name="intellij.python.community" />
<orderEntry type="module" module-name="intellij.platform.testFramework" />
<orderEntry type="module" module-name="intellij.python.sdk" />
<orderEntry type="module" module-name="intellij.platform.execution" />
<orderEntry type="library" name="kotlin-reflect" level="project" />
<orderEntry type="module" module-name="intellij.platform.lang.impl" />
<orderEntry type="module" module-name="intellij.platform.ide.impl" />
</component>
</module>
python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/PyEnvTestSettings.kt
+2 -1
View File
@@ -2,13 +2,14 @@
package com.intellij.python.community.testFramework.testEnv
import com.intellij.python.community.testFramework.testEnv.PyEnvTestSettings.Companion.PATH_TO_TEST_ENV_PYTHON_INTERPRETERS
import com.intellij.testFramework.UsefulTestCase.IS_UNDER_TEAMCITY
import com.intellij.util.SystemProperties
import org.jetbrains.annotations.ApiStatus
import org.jetbrains.annotations.TestOnly
import java.io.File
private val IS_UNDER_TEAMCITY: Boolean = System.getenv("TEAMCITY_VERSION") != null
/**
* Configures env test environment using env vars and properties.
* Environment variables are also used in gradle script (setup-test-environment)
python/setup-test-environment/src/com/intellij/python/community/testFramework/testEnv/TypeVanillaPython3.kt
+2 -3
View File
@@ -6,7 +6,7 @@ import com.intellij.openapi.projectRoots.SdkType
import com.intellij.openapi.projectRoots.impl.SdkConfigurationUtil
import com.intellij.openapi.util.Disposer
import com.intellij.openapi.vfs.newvfs.impl.VfsRootAccess
import com.intellij.testFramework.utils.vfs.refreshAndGetVirtualFile
import com.intellij.openapi.vfs.refreshAndFindVirtualFileOrDirectory
import com.jetbrains.python.PyNames
import com.jetbrains.python.PythonBinary
import java.nio.file.Path
@@ -14,9 +14,8 @@ import java.nio.file.Path
data object TypeVanillaPython3 : PythonType<PythonBinary>("python3") {
override suspend fun createSdkFor(python: PythonBinary): Sdk = createSdk(python)
// TODO: DOC
fun createSdk(python: PythonBinary): Sdk =
SdkConfigurationUtil.setupSdk(emptyArray(), python.refreshAndGetVirtualFile(),
SdkConfigurationUtil.setupSdk(emptyArray(), python.refreshAndFindVirtualFileOrDirectory()!!,
SdkType.findByName(PyNames.PYTHON_SDK_ID_NAME)!!, null, null)
// Python is directly executable