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

Tests: revert env variable for defining list of Python test envs

Browse Source
This commit is contained in:
Elizaveta Shashkova
2017-12-19 14:29:59 +03:00
parent 90afc1f4c7
commit 5b78968625
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/testSrc/com/jetbrains/env/PyEnvTestCase.java
Vendored
+12 -3
View File
@@ -47,11 +47,15 @@ public abstract class PyEnvTestCase {
/**
* Folder with python interpreters.
*/
private static final String PYCHARM_PYTHON_ENVS = "PYCHARM_PYTHONS";
private static final String PYCHARM_PYTHONS = "PYCHARM_PYTHONS";
/**
* Folder with virtual envs.
*/
private static final String PYCHARM_PYTHON_VIRTUAL_ENVS = "PYCHARM_PYTHON_VIRTUAL_ENVS";
/**
* Separated list of python interpreters
*/
private static final String PYCHARM_PYTHON_ENVS = "PYCHARM_PYTHON_ENVS";
protected static final boolean IS_ENV_CONFIGURATION = System.getProperty("pycharm.env") != null;
@@ -216,7 +220,7 @@ public abstract class PyEnvTestCase {
*/
Assume.assumeFalse(testName +
": environments are not defined. Skipping. \nSpecify either " +
PYCHARM_PYTHON_ENVS +
PYCHARM_PYTHONS +
" or " +
PYCHARM_PYTHON_VIRTUAL_ENVS +
" environment variable.",
@@ -266,7 +270,7 @@ public abstract class PyEnvTestCase {
public static List<String> getPythonRoots() {
List<String> roots = Lists.newArrayList();
String envs = System.getenv(PYCHARM_PYTHON_ENVS);
String envs = System.getenv(PYCHARM_PYTHONS);
if (envs != null) {
roots.addAll(readEnvRoots(envs));
}
@@ -276,6 +280,11 @@ public abstract class PyEnvTestCase {
roots.addAll(readEnvRoots(virtualEnvs));
}
String envsList = System.getenv(PYCHARM_PYTHON_ENVS);
if (envsList != null) {
roots.addAll(Lists.newArrayList(envsList.split(File.pathSeparator)));
}
return roots;
}