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

Env test fix: env tests should obtain real packaged

Browse Source
This commit is contained in:
Ilya.Kazakevich
2015-12-28 23:31:22 +03:00
parent 7f083fdc6d
commit 3b08c8d60b
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+8 -6
View File
@@ -290,12 +290,13 @@ public class PyPackageManagerImpl extends PyPackageManager {
@NotNull
protected List<PyPackage> getPackages() throws ExecutionException {
if (ApplicationManager.getApplication().isUnitTestMode()) {
return Lists.newArrayList(new PyPackage(PIP, PIP_VERSION, null, Collections.<PyRequirement>emptyList()),
new PyPackage(SETUPTOOLS, SETUPTOOLS_VERSION, null, Collections.<PyRequirement>emptyList()));
}
final String output = getHelperResult(PACKAGING_TOOL, Collections.singletonList("list"), false, false, null);
return parsePackagingToolOutput(output);
final List<PyPackage> packages = new ArrayList<PyPackage>(parsePackagingToolOutput(output));
if (packages.isEmpty() && ApplicationManager.getApplication().isUnitTestMode()) {
packages.addAll(Lists.newArrayList(new PyPackage(PIP, PIP_VERSION, null, Collections.<PyRequirement>emptyList()),
new PyPackage(SETUPTOOLS, SETUPTOOLS_VERSION, null, Collections.<PyRequirement>emptyList())));
}
return packages;
}
@Nullable
@@ -493,7 +494,8 @@ public class PyPackageManagerImpl extends PyPackageManager {
else {
process = commandLine.createProcess();
}
final CapturingProcessHandler handler = new CapturingProcessHandler(process, commandLine.getCharset(), commandLine.getCommandLineString());
final CapturingProcessHandler handler =
new CapturingProcessHandler(process, commandLine.getCharset(), commandLine.getCommandLineString());
final ProgressIndicator indicator = ProgressManager.getInstance().getProgressIndicator();
final ProcessOutput result;
if (showProgress && indicator != null) {