git: use asyncssh as dulwich SSH vendor (#6797)

* git: support client kwargs for auth in remote methods

* tests: use docker for git/ssh server

* move dulwich backend into subdir

* add base sync<->async support

* dulwich: add initial asyncssh SSH vendor

* dulwich: use asyncssh as the default SSH vendor

* add test for git over ssh

* test read (fetch) over ssh

* ci: re-enable ssh tests

temporary workaround for #6788, #6789

* move async stubs into dvc.scm.asyn

* tests: use sshfs and not dvc.fs.ssh

* allow explicit 0-length read in asyncssh vendor
This commit is contained in:
Peter Rowlands (변기호)
2021-10-21 14:36:45 +09:00
committed by GitHub
parent b652670cbf
commit 73f2fa8c93
12 changed files with 294 additions and 16 deletions
+49
View File
@@ -331,3 +331,52 @@ def test_git_stash_clear(tmp_dir, scm, ref):
not os.path.exists(log_path)
or not open(log_path, encoding="utf-8").read()
)
@pytest.mark.needs_internet
@pytest.mark.parametrize("server", [pytest.lazy_fixture("git_ssh")])
def test_git_ssh(tmp_dir, scm, server):
from dulwich.repo import Repo as DulwichRepo
from sshfs import SSHFileSystem
from dvc.utils.fs import remove
from tests.remotes.ssh import TEST_SSH_KEY_PATH, TEST_SSH_USER
fs = SSHFileSystem(
host=server.host,
port=server.port,
username=TEST_SSH_USER,
client_keys=[TEST_SSH_KEY_PATH],
)
server._ssh.execute("git init --bare test-repo.git")
url = f"ssh://{TEST_SSH_USER}@{server.host}:{server.port}/~/test-repo.git"
tmp_dir.scm_gen("foo", "foo", commit="init")
rev = scm.get_rev()
scm.push_refspec(
url,
"refs/heads/master",
"refs/heads/master",
force=True,
key_filename=TEST_SSH_KEY_PATH,
)
assert (
rev.encode("ascii")
== fs.open("test-repo.git/refs/heads/master").read().strip()
)
remove(tmp_dir / ".git")
remove(tmp_dir / "foo")
DulwichRepo.init(str(tmp_dir))
scm.fetch_refspecs(
url,
["refs/heads/master"],
force=True,
key_filename=TEST_SSH_KEY_PATH,
)
assert rev == scm.get_ref("refs/heads/master")
scm.checkout("master")
assert "foo" == (tmp_dir / "foo").read_text()