mirror of
https://github.com/Stone-Red-Code/dvc.git
synced 2026-11-01 23:08:43 +01:00
tests: remove real SSH (#4200)
* tests: remove real SSH No longer needed, all tests are using mocked ssh already. * travis: don't setup ssh
This commit is contained in:
@@ -16,21 +16,6 @@ fi
|
||||
echo >env.sh
|
||||
|
||||
if [[ "$TRAVIS_BUILD_STAGE_NAME" == "test" ]]; then
|
||||
if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
|
||||
# NOTE: ssh keys for ssh test to be able to ssh to the localhost
|
||||
ssh-keygen -t rsa -N "" -f mykey
|
||||
mkdir -p ~/.ssh
|
||||
cp mykey ~/.ssh/id_rsa
|
||||
cp mykey.pub ~/.ssh/id_rsa.pub
|
||||
cat mykey.pub >>~/.ssh/authorized_keys
|
||||
ssh-keyscan localhost >>~/.ssh/known_hosts
|
||||
ssh localhost ls &>/dev/null
|
||||
ssh-keyscan 127.0.0.1 >>~/.ssh/known_hosts
|
||||
ssh 127.0.0.1 ls &>/dev/null
|
||||
ssh-keyscan 0.0.0.0 >>~/.ssh/known_hosts
|
||||
ssh 0.0.0.0 ls &>/dev/null
|
||||
fi
|
||||
|
||||
if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
|
||||
brew install openssl
|
||||
$scriptdir/retry.sh brew cask install google-cloud-sdk
|
||||
|
||||
@@ -29,7 +29,6 @@ from .gs import ( # noqa: F401; noqa: F401
|
||||
gs,
|
||||
)
|
||||
from .ssh import ( # noqa: F401; noqa: F401
|
||||
SSH,
|
||||
SSHMocked,
|
||||
ssh,
|
||||
ssh_connection,
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
import getpass
|
||||
import locale
|
||||
import os
|
||||
from contextlib import contextmanager
|
||||
from subprocess import CalledProcessError, check_output
|
||||
|
||||
import pytest
|
||||
from funcy import cached_property
|
||||
|
||||
from dvc.path_info import URLInfo
|
||||
from dvc.utils import env2bool
|
||||
|
||||
from .base import Base
|
||||
from .local import Local
|
||||
@@ -19,31 +16,6 @@ TEST_SSH_KEY_PATH = os.path.join(
|
||||
)
|
||||
|
||||
|
||||
class SSH:
|
||||
@staticmethod
|
||||
def should_test():
|
||||
do_test = env2bool("DVC_TEST_SSH", undefined=None)
|
||||
if do_test is not None:
|
||||
return do_test
|
||||
|
||||
# FIXME: enable on windows
|
||||
if os.name == "nt":
|
||||
return False
|
||||
|
||||
try:
|
||||
check_output(["ssh", "-o", "BatchMode=yes", "127.0.0.1", "ls"])
|
||||
except (CalledProcessError, OSError):
|
||||
return False
|
||||
|
||||
return True
|
||||
|
||||
@staticmethod
|
||||
def get_url():
|
||||
return "ssh://{}@127.0.0.1:22{}".format(
|
||||
getpass.getuser(), Local.get_storagepath()
|
||||
)
|
||||
|
||||
|
||||
class SSHMocked(Base, URLInfo):
|
||||
@staticmethod
|
||||
def get_url(user, port): # pylint: disable=arguments-differ
|
||||
|
||||
Reference in New Issue
Block a user