From 3b08c8d60bbf1ce6974526a4c3f9e9d045d50fc1 Mon Sep 17 00:00:00 2001
From: "Ilya.Kazakevich" <Ilya.Kazakevich@jetbrains.com>
Date: Mon, 28 Dec 2015 23:24:11 +0300
Subject: [PATCH] Env test fix: env tests should obtain real packaged

---
 .../python/packaging/PyPackageManagerImpl.java     | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
index 9b713a14908c..f280e347808a 100644
--- a/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
+++ b/python/src/com/jetbrains/python/packaging/PyPackageManagerImpl.java
@@ -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) {