diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh index 69798d2f32..dcfec8e6a4 100644 --- a/scripts/ci/before_install.sh +++ b/scripts/ci/before_install.sh @@ -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 diff --git a/tests/remotes/__init__.py b/tests/remotes/__init__.py index 05e1a2ea3f..96421827b7 100644 --- a/tests/remotes/__init__.py +++ b/tests/remotes/__init__.py @@ -29,7 +29,6 @@ gs, ) from .ssh import ( # noqa: F401; noqa: F401 - SSH, SSHMocked, ssh, ssh_connection, diff --git a/tests/remotes/ssh.py b/tests/remotes/ssh.py index 8081fcda41..098fcf0efe 100644 --- a/tests/remotes/ssh.py +++ b/tests/remotes/ssh.py @@ -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 @@ ) -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