fix test case

conda_env/cli/common.py

@@ -60,13 +60,3 @@ def check_specs(prefix, specs, json=False, create=False):
                     conda config --add create_default_packages PACKAGE_NAME
             """)
         raise CondaEnvException(msg)
-
-
-def get_index_trap(*args, **kwargs):
-    """
-    Retrieves the package index, but traps exceptions and reports them as
-    JSON if necessary.
-    """
-    from conda.api import get_index
-    kwargs.pop('json')
-    return get_index(*args, **kwargs)

conda_env/installers/conda.py

@@ -2,8 +2,9 @@
 
 from conda.cli import common
 from conda import plan
-from conda_env.cli.common import check_specs, get_index_trap
+from conda_env.cli.common import check_specs
 from conda.exceptions import LockError, CondaSystemExit, CondaRuntimeError
+from conda.api import get_index
 from conda.compat import text_type
 
 
@@ -13,9 +14,9 @@ def install(prefix, specs, args, env, prune=False):
 
     # TODO: support all various ways this happens
     # Including 'nodefaults' in the channels list disables the defaults
-    index = get_index_trap(channel_urls=[chan for chan in env.channels
-                                                     if chan != 'nodefaults'],
-                                  prepend='nodefaults' not in env.channels)
+    index = get_index(channel_urls=[chan for chan in env.channels
+                                    if chan != 'nodefaults'],
+                      prepend='nodefaults' not in env.channels)
     actions = plan.install_actions(prefix, index, specs, prune=prune)
 
     with common.json_progress_bars(json=args.json and not args.quiet):

conda_env/installers/pip.py

@@ -11,4 +11,3 @@ def install(prefix, specs, args, env, prune=False):
 
     if process.returncode != 0:
         raise CondaValueError("pip returned an error.")
-

tests/conda_env/installers/test_pip.py

@@ -5,7 +5,7 @@
     import mock
 
 from conda_env.installers import pip
-
+from conda.exceptions import CondaValueError
 
 class PipInstallerTest(unittest.TestCase):
     def test_straight_install(self):
@@ -27,5 +27,5 @@ def test_stops_on_exception(self):
                 # make sure that installed doesn't bail early
                 pip_args.return_value = ['pip']
 
-                self.assertRaises(SystemExit, pip.install,
+                self.assertRaises(CondaValueError, pip.install,
                                   '/some/prefix', ['foo'], '', '')

tests/conda_env/support/notebook.ipynb

@@ -1 +1 @@
-{"nbformat_minor": 0, "worksheets": [{"cells": []}], "nbformat": 3, "metadata": {"signature": "", "name": ""}}
+{"nbformat": 3, "nbformat_minor": 0, "worksheets": [{"cells": []}], "metadata": {"name": "", "signature": ""}}

tests/conda_env/test_cli.py

@@ -276,6 +276,8 @@ def test_list(self):
             run_conda_command(Commands.CREATE, test_env_name_2, "--file " + env_txt.name)
             self.assertTrue(env_is_created(test_env_name_2))
 
+        snowflake2, e = run_conda_command(Commands.LIST, test_env_name_2, "-e")
+        self.assertEqual(snowflake, snowflake2)
 
 if __name__ == '__main__':
     unittest.main()