mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-02 07:18:25 +01:00
Peter Rowlands (변기호)
0d895e2661
* executor: move local specific git initialization out of base * machine: return kwargs for executor init instead of executor object * executor: add initial ssh executor * ssh-executor: disable strict host checking for dvc-machine instances * initial tests for ssh executor * drop GIT_SSH_COMMAND usage * push: accept destination odb as a parameter * separate cache initialization into executor.init_cache * add test for ssh executor cache init * remove dead code * machine: fixture-ize default test scenarios * test SSHExecutor.from_machine * tpi: return default SSH port for constructing executors
88 lines
2.6 KiB
Python
88 lines
2.6 KiB
Python
import posixpath
|
|
from contextlib import contextmanager
|
|
from functools import partial
|
|
|
|
import pytest
|
|
|
|
from dvc.fs.ssh import SSHFileSystem
|
|
from dvc.path_info import URLInfo
|
|
from dvc.repo.experiments.base import EXEC_HEAD, EXEC_MERGE
|
|
from dvc.repo.experiments.executor.ssh import SSHExecutor
|
|
from tests.func.machine.conftest import * # noqa, pylint: disable=wildcard-import
|
|
from tests.remotes.ssh import TEST_SSH_KEY_PATH, TEST_SSH_USER
|
|
|
|
|
|
@contextmanager
|
|
def _ssh_factory(cloud):
|
|
yield SSHFileSystem(
|
|
host=cloud.host,
|
|
port=cloud.port,
|
|
user=TEST_SSH_USER,
|
|
keyfile=TEST_SSH_KEY_PATH,
|
|
)
|
|
|
|
|
|
def test_from_machine(tmp_dir, scm, dvc, machine_instance, mocker):
|
|
mocker.patch.object(SSHExecutor, "_init_git")
|
|
executor = SSHExecutor.from_machine(dvc.machine, "foo", scm, "")
|
|
assert executor.host == machine_instance["instance_ip"]
|
|
|
|
|
|
@pytest.mark.needs_internet
|
|
@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
|
|
def test_init_git(tmp_dir, scm, cloud):
|
|
tmp_dir.scm_gen({"foo": "foo", "dir": {"bar": "bar"}}, commit="init")
|
|
rev = scm.get_rev()
|
|
scm.set_ref(EXEC_HEAD, rev)
|
|
tmp_dir.gen("foo", "stashed")
|
|
scm.gitpython.git.stash()
|
|
rev = scm.resolve_rev("stash@{0}")
|
|
scm.set_ref(EXEC_MERGE, rev)
|
|
|
|
root_url = URLInfo(str(cloud)) / SSHExecutor.gen_dirname()
|
|
|
|
executor = SSHExecutor(
|
|
scm,
|
|
".",
|
|
root_dir=root_url.path,
|
|
host=root_url.host,
|
|
port=root_url.port,
|
|
username=TEST_SSH_USER,
|
|
fs_factory=partial(_ssh_factory, cloud),
|
|
)
|
|
assert root_url.path == executor._repo_abspath
|
|
|
|
fs = cloud._ssh
|
|
assert fs.exists(posixpath.join(executor._repo_abspath, "foo"))
|
|
assert fs.exists(posixpath.join(executor._repo_abspath, "dir"))
|
|
assert fs.exists(posixpath.join(executor._repo_abspath, "dir", "bar"))
|
|
|
|
|
|
@pytest.mark.needs_internet
|
|
@pytest.mark.parametrize("cloud", [pytest.lazy_fixture("git_ssh")])
|
|
def test_init_cache(tmp_dir, dvc, scm, cloud):
|
|
foo = tmp_dir.dvc_gen("foo", "foo", commit="init")[0].outs[0]
|
|
rev = scm.get_rev()
|
|
scm.set_ref(EXEC_HEAD, rev)
|
|
scm.set_ref(EXEC_MERGE, rev)
|
|
root_url = URLInfo(str(cloud)) / SSHExecutor.gen_dirname()
|
|
|
|
executor = SSHExecutor(
|
|
scm,
|
|
".",
|
|
root_dir=root_url.path,
|
|
host=root_url.host,
|
|
port=root_url.port,
|
|
username=TEST_SSH_USER,
|
|
fs_factory=partial(_ssh_factory, cloud),
|
|
)
|
|
executor.init_cache(dvc, rev)
|
|
|
|
fs = cloud._ssh
|
|
foo_hash = foo.hash_info.value
|
|
assert fs.exists(
|
|
posixpath.join(
|
|
executor._repo_abspath, ".dvc", "cache", foo_hash[:2], foo_hash[2:]
|
|
)
|
|
)
|