Cleanup

Signed-off-by: aiordache <anca.iordache@docker.com>

Makefile

@@ -1,5 +1,5 @@
 TEST_API_VERSION ?= 1.39
-TEST_ENGINE_VERSION ?= 19.03.12
+TEST_ENGINE_VERSION ?= 19.03.13
 
 .PHONY: all
 all: test

docker/transport/sshconn.py

@@ -83,11 +83,7 @@ def connect(self, **kwargs):
             stdin=subprocess.PIPE)
 
     def sendall(self, msg):
-        if not self.proc or self.proc.stdin.closed:
-            raise Exception('SSH subprocess not initiated.'
-                            'connect() must be called first.')
-        self.proc.stdin.write(msg)
-        self.proc.stdin.flush()
+        self.send(msg)
 
     def send(self, msg):
         if not self.proc or self.proc.stdin.closed:
@@ -153,8 +149,6 @@ def __init__(self, ssh_client=None, timeout=60, maxsize=10, host=None):
             self.ssh_transport = ssh_client.get_transport()
         self.timeout = timeout
         self.host = host
-
-        # self.base_url = six.moves.urllib_parse.urlparse(host)
         self.port = None
         if ':' in host:
             self.host, self.port = host.split(':')

tests/Dockerfile

@@ -1,15 +1,16 @@
 ARG PYTHON_VERSION=3.7
+
 FROM python:${PYTHON_VERSION}
 
 ARG APT_MIRROR
 RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
     && sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
 
 RUN apt-get update && apt-get -y install --no-install-recommends \
-    gnupg2 \
-    pass \
     curl \
-    openssh-client
+    gnupg2 \
+    openssh-client \
+    pass
 
 # Add SSH keys and set permissions
 COPY tests/ssh-keys /root/.ssh