diff --git a/dvc/external_repo.py b/dvc/external_repo.py index 3f55f128a..ed4b8b39e 100644 --- a/dvc/external_repo.py +++ b/dvc/external_repo.py @@ -74,12 +74,14 @@ def _external_repo(url=None, rev=None, cache_dir=None): if os.path.isdir(url): rconfig = RemoteConfig(repo.config) if not _remote_config_exists(rconfig): + original_repo = Repo(url) rconfig.add( "upstream", - repo.cache.local.cache_dir, + original_repo.cache.local.cache_dir, default=True, level=Config.LEVEL_LOCAL, ) + original_repo.close() if cache_dir is not None: cache_config = CacheConfig(repo.config) diff --git a/tests/func/test_external_repo.py b/tests/func/test_external_repo.py index e6a8ee7bc..4c34505a0 100644 --- a/tests/func/test_external_repo.py +++ b/tests/func/test_external_repo.py @@ -1,3 +1,4 @@ +import filecmp import os from mock import patch @@ -30,8 +31,10 @@ def test_external_repo(erepo): def test_external_repo_import_without_remote(erepo, dvc_repo): - src = erepo.CODE - dst = dvc_repo.root_dir + src = erepo.FOO + dst = os.path.join(dvc_repo.root_dir, "foo") Repo.get(erepo.root_dir, src, dst) - assert os.path.exists(dst + "/" + erepo.CODE) + assert os.path.exists(dst) + assert os.path.isfile(dst) + assert filecmp.cmp(erepo.FOO, dst, shallow=False) diff --git a/tests/func/test_get.py b/tests/func/test_get.py index 07551c5f3..8b99547f0 100644 --- a/tests/func/test_get.py +++ b/tests/func/test_get.py @@ -101,7 +101,6 @@ def test_get_from_non_dvc_master(erepo, tmp_path, monkeypatch, caplog): with caplog.at_level(logging.INFO, logger="dvc"): Repo.get(erepo._root_dir, erepo.FOO, out=imported_file, rev="branch") - assert caplog.text == "" assert filecmp.cmp( os.path.join(erepo._root_dir, erepo.FOO), imported_file, shallow=False )