mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
get-url/ls-url: support remote:// with in-repo config
This commit is contained in:
@@ -3,6 +3,7 @@ import os
|
||||
|
||||
import pytest
|
||||
|
||||
from dvc.config import Config
|
||||
from dvc.exceptions import FileExistsLocallyError, URLMissingError
|
||||
from dvc.repo import Repo
|
||||
from dvc.testing.workspace_tests import TestGetUrl as _TestGetUrl
|
||||
@@ -66,3 +67,12 @@ def test_get_url_nonexistent(tmp_dir):
|
||||
|
||||
class TestGetUrl(_TestGetUrl):
|
||||
pass
|
||||
|
||||
|
||||
def test_get_url_config(tmp_dir, dvc, make_remote):
|
||||
remote_path = make_remote("myremote", default=False, typ="local")
|
||||
(remote_path / "foo").write_text("foo")
|
||||
(remote_path / "bar").write_text("bar")
|
||||
|
||||
Repo.get_url("remote://myremote/foo", config=Config.from_cwd())
|
||||
assert (tmp_dir / "foo").read_text() == "foo"
|
||||
|
||||
@@ -1,5 +1,23 @@
|
||||
from dvc.config import Config
|
||||
from dvc.repo import Repo
|
||||
from dvc.testing.workspace_tests import TestLsUrl as _TestLsUrl
|
||||
|
||||
|
||||
class TestLsUrl(_TestLsUrl):
|
||||
pass
|
||||
|
||||
|
||||
def test_ls_url_config(dvc, make_remote):
|
||||
remote_path = make_remote("myremote", default=False, typ="local")
|
||||
(remote_path / "foo").write_text("foo")
|
||||
(remote_path / "bar").write_text("bar")
|
||||
|
||||
actual = sorted(
|
||||
Repo.ls_url("remote://myremote", config=Config.from_cwd()),
|
||||
key=lambda entry: entry["path"],
|
||||
)
|
||||
expected = [
|
||||
{"isdir": False, "path": "bar", "size": 3},
|
||||
{"isdir": False, "path": "foo", "size": 3},
|
||||
]
|
||||
assert actual == expected
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
from dvc.cli import parse_args
|
||||
from dvc.commands.get_url import CmdGetUrl
|
||||
from dvc.config import Config
|
||||
|
||||
|
||||
def test_get_url(mocker):
|
||||
def test_get_url(mocker, M):
|
||||
cli_args = parse_args(["get-url", "src", "out", "-j", "5"])
|
||||
assert cli_args.func == CmdGetUrl
|
||||
|
||||
@@ -11,4 +12,11 @@ def test_get_url(mocker):
|
||||
|
||||
assert cmd.run() == 0
|
||||
|
||||
m.assert_called_once_with("src", out="out", jobs=5, force=False, fs_config=None)
|
||||
m.assert_called_once_with(
|
||||
"src",
|
||||
out="out",
|
||||
jobs=5,
|
||||
force=False,
|
||||
fs_config=None,
|
||||
config=M.instance_of(Config),
|
||||
)
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
from dvc.cli import parse_args
|
||||
from dvc.commands.ls_url import CmdListUrl
|
||||
from dvc.config import Config
|
||||
|
||||
|
||||
def test_ls_url(mocker):
|
||||
def test_ls_url(mocker, M):
|
||||
cli_args = parse_args(["ls-url", "src"])
|
||||
assert cli_args.func == CmdListUrl
|
||||
cmd = cli_args.func(cli_args)
|
||||
@@ -10,10 +11,12 @@ def test_ls_url(mocker):
|
||||
|
||||
assert cmd.run() == 0
|
||||
|
||||
m.assert_called_once_with("src", recursive=False, fs_config=None)
|
||||
m.assert_called_once_with(
|
||||
"src", recursive=False, fs_config=None, config=M.instance_of(Config)
|
||||
)
|
||||
|
||||
|
||||
def test_recursive(mocker):
|
||||
def test_recursive(mocker, M):
|
||||
cli_args = parse_args(["ls-url", "-R", "src"])
|
||||
assert cli_args.func == CmdListUrl
|
||||
cmd = cli_args.func(cli_args)
|
||||
@@ -21,4 +24,6 @@ def test_recursive(mocker):
|
||||
|
||||
assert cmd.run() == 0
|
||||
|
||||
m.assert_called_once_with("src", recursive=True, fs_config=None)
|
||||
m.assert_called_once_with(
|
||||
"src", recursive=True, fs_config=None, config=M.instance_of(Config)
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user