Skip to content

Commit

Permalink
Merge pull request conda#3291 from HugoTian/conda-export-fix
Browse files Browse the repository at this point in the history
Conda : Fix channel issue about list -e and create env from file
  • Loading branch information
kalefranz authored Aug 18, 2016
2 parents 5a8e020 + d4bcde2 commit f9d386e
Show file tree
Hide file tree
Showing 2 changed files with 92 additions and 1 deletion.
3 changes: 2 additions & 1 deletion conda/cli/main_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,8 @@ def execute(args, parser):
if args.canonical:
format = 'canonical'
elif args.export:
format = 'export'
print_explicit(prefix, args.md5)
return
else:
format = 'human'

Expand Down
90 changes: 90 additions & 0 deletions tests/test_export.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
from .test_create import (make_temp_env, package_is_installed, PYTHON_BINARY,
assert_package_is_installed, run_command, Commands,
make_temp_prefix)
from os.path import (exists, join, basename)
from unittest import TestCase
import tempfile
import pytest

from conda.install import rm_rf

class ExportIntegrationTests(TestCase):

@pytest.mark.timeout(900)
def test_basic(self):
with make_temp_env("python=3") as prefix:
assert exists(join(prefix, PYTHON_BINARY))
assert_package_is_installed(prefix, 'python-3')

output, error = run_command(Commands.LIST, prefix, "-e")

with tempfile.NamedTemporaryFile(mode="w", suffix="txt", delete=False) as env_txt:
env_txt.write(output)
env_txt.flush()
env_txt.close()
prefix2 = make_temp_prefix()
run_command(Commands.CREATE, prefix2 , "--file " + env_txt.name)

assert_package_is_installed(prefix2, "python")

output2, error= run_command(Commands.LIST, prefix2, "-e")
self.assertEqual(output, output2)

def test_multi_channel_export(self):
"""
When try to import from txt
every package should come from same channel
"""
with make_temp_env("python=3") as prefix:
assert exists(join(prefix, PYTHON_BINARY))
assert_package_is_installed(prefix, 'python-3')

run_command(Commands.INSTALL, prefix, "six", "-c", "conda-forge")
assert_package_is_installed(prefix, "six")

output, error = run_command(Commands.LIST, prefix, "-e")
self.assertIn("conda-forge", output)

try:
with tempfile.NamedTemporaryFile(mode="w", suffix="txt", delete=False) as env_txt:
env_txt.write(output)
env_txt.close()
prefix2 = make_temp_prefix()
run_command(Commands.CREATE, prefix2 , "--file " + env_txt.name)

assert_package_is_installed(prefix2, "python")
output2, error = run_command(Commands.LIST, prefix2, "-e")
self.assertEqual(output, output2)
finally:
rm_rf(env_txt.name)


def test_multi_channel_explicit(self):
"""
When try to import from txt
every package should come from same channel
"""
with make_temp_env("python=3") as prefix:
assert exists(join(prefix, PYTHON_BINARY))
assert_package_is_installed(prefix, 'python-3')

run_command(Commands.INSTALL, prefix, "six", "-c", "conda-forge")
assert_package_is_installed(prefix, "six")

output, error = run_command(Commands.LIST, prefix, "--explicit")
self.assertIn("conda-forge", output)

try:
with tempfile.NamedTemporaryFile(mode="w", suffix="txt", delete=False) as env_txt:
env_txt.write(output)
env_txt.close()
prefix2 = make_temp_prefix()
run_command(Commands.CREATE, prefix2, "--file " + env_txt.name)

assert_package_is_installed(prefix2, "python")
assert_package_is_installed(prefix2, "six")
output2, _ = run_command(Commands.LIST, prefix2, "--explicit")
self.assertEqual(output, output2)
finally:
rm_rf(env_txt.name)

0 comments on commit f9d386e

Please sign in to comment.