mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-19 15:28:28 +01:00
fetched: correctly order mixed odbs (#6436)
This commit is contained in:
+2
-1
@@ -61,7 +61,8 @@ def fetch(
|
||||
|
||||
for odb, obj_ids in sorted(
|
||||
used.items(),
|
||||
key=lambda item: item[0] and item[0].fs.scheme == Schemes.MEMORY,
|
||||
key=lambda item: item[0] is not None
|
||||
and item[0].fs.scheme == Schemes.MEMORY,
|
||||
):
|
||||
d, f = _fetch(
|
||||
self,
|
||||
|
||||
@@ -350,6 +350,27 @@ def test_pull_external_dvc_imports(tmp_dir, dvc, scm, erepo_dir):
|
||||
assert (tmp_dir / "new_dir" / "bar").read_text() == "bar"
|
||||
|
||||
|
||||
def test_pull_external_dvc_imports_mixed(
|
||||
tmp_dir, dvc, scm, erepo_dir, local_remote
|
||||
):
|
||||
with erepo_dir.chdir():
|
||||
erepo_dir.dvc_gen("foo", "foo", commit="first")
|
||||
os.remove("foo")
|
||||
|
||||
# imported: foo
|
||||
dvc.imp(os.fspath(erepo_dir), "foo")
|
||||
|
||||
# local-object: bar
|
||||
tmp_dir.dvc_gen("bar", "bar")
|
||||
dvc.push("bar")
|
||||
|
||||
clean(["foo", "bar"], dvc)
|
||||
|
||||
assert dvc.pull()["fetched"] == 2
|
||||
assert (tmp_dir / "foo").read_text() == "foo"
|
||||
assert (tmp_dir / "bar").read_text() == "bar"
|
||||
|
||||
|
||||
def clean(outs, dvc=None):
|
||||
from tests.utils import clean_staging
|
||||
|
||||
|
||||
Reference in New Issue
Block a user