Fixed incorrect timeout being applied to native client socket.

    Added native clients integration tests for client timeout connecting to unreachable or unknown host.
    Resolves #133
    Added windows 3.7 wheel builds
    Updated changelog

Author: Pan

.appveyor.yml

@@ -59,6 +59,18 @@ environment:
       MSVC: "Visual Studio 14 Win64"
       ARCH: x64_86
 
+    - PYTHON: "C:\\Python37"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "32"
+      MSVC: "Visual Studio 14"
+      ARCH: i386
+
+    - PYTHON: "C:\\Python37-x64"
+      PYTHON_VERSION: "3.7"
+      PYTHON_ARCH: "64"
+      MSVC: "Visual Studio 14 Win64"
+      ARCH: x64_86
+
 install:
   # If there is a newer build queued for the same PR, cancel this one.
   # The AppVeyor 'rollout builds' option is supposed to serve the same

Changelog.rst

@@ -1,6 +1,19 @@
 Change Log
 ============
 
+1.8.1
+++++++
+
+Fixes
+------
+
+* Native client socket timeout setting would be longer than expected - #133
+
+Packaging
+---------
+
+* Added Windows 3.7 wheels
+
 1.8.0
 ++++++
 

pssh/clients/native/single.py

@@ -113,7 +113,7 @@ def __init__(self, host,
         self.port = port if port else 22
         self.num_retries = num_retries
         self.sock = None
-        self.timeout = timeout * 1000 if timeout else None
+        self.timeout = timeout
         self.retry_delay = retry_delay
         self.allow_agent = allow_agent
         self.forward_ssh_agent = forward_ssh_agent
@@ -158,7 +158,8 @@ def _connect_init_retry(self, retries):
     def _init(self, retries=1):
         self.session = Session()
         if self.timeout:
-            self.session.set_timeout(self.timeout)
+            # libssh2 timeout is in ms
+            self.session.set_timeout(self.timeout * 1000)
         try:
             self.session.handshake(self.sock)
         except Exception as ex:
@@ -180,7 +181,8 @@ def _init(self, retries=1):
 
     def _connect(self, host, port, retries=1):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
-        self.sock.settimeout(self.timeout)
+        if self.timeout:
+            self.sock.settimeout(self.timeout)
         logger.debug("Connecting to %s:%s", host, port)
         try:
             self.sock.connect((host, port))

tests/test_native_parallel_client.py

@@ -34,7 +34,7 @@
 import time
 
 
-from gevent import joinall
+from gevent import joinall, spawn
 from pssh.clients.native import ParallelSSHClient
 from pssh.exceptions import UnknownHostException, \
     AuthenticationException, ConnectionErrorException, SessionError, \
@@ -276,19 +276,29 @@ def test_pssh_client_timeout(self):
         self.assertIsInstance(output[self.host].exception,
                               Timeout)
 
-#     def test_pssh_client_run_command_password(self):
-#         """Test password authentication. Embedded server accepts any password
-#         even empty string"""
-#         client = ParallelSSHClient([self.host], port=self.listen_port,
-#                                    password='')
-#         output = client.run_command(self.fake_cmd)
-#         stdout = list(output[self.host]['stdout'])
-#         self.assertTrue(self.host in output,
-#                         msg="No output for host")
-#         self.assertTrue(output[self.host]['exit_code'] == 0,
-#                         msg="Expected exit code 0, got %s" % (
-#                             output[self.host]['exit_code'],))
-#         self.assertEqual(stdout, [self.fake_resp])
+    def test_connection_timeout(self):
+        client_timeout = .01
+        host = 'fakehost.com'
+        client = ParallelSSHClient([host], port=self.port,
+                                   pkey=self.user_key,
+                                   timeout=client_timeout,
+                                   num_retries=1)
+        cmd = spawn(client.run_command, 'sleep 1', stop_on_errors=False)
+        output = cmd.get(timeout=client_timeout * 200)
+        self.assertIsInstance(output[host].exception,
+                              ConnectionErrorException)
+
+    def test_zero_timeout(self):
+        host = '127.0.0.2'
+        server = OpenSSHServer(listen_ip=host, port=self.port)
+        server.start_server()
+        client = ParallelSSHClient([self.host, host],
+                                   port=self.port,
+                                   pkey=self.user_key,
+                                   timeout=0)
+        cmd = spawn(client.run_command, 'sleep 1', stop_on_errors=False)
+        output = cmd.get(timeout=3)
+        self.assertTrue(output[self.host].exception is None)
 
     def test_pssh_client_long_running_command_exit_codes(self):
         expected_lines = 2

tests/test_native_single_client.py

@@ -4,15 +4,15 @@
 import time
 import subprocess
 
-from gevent import socket, sleep
+from gevent import socket, sleep, spawn
 
 from .base_ssh2_test import SSH2TestCase
 from .embedded_server.openssh import OpenSSHServer
 from pssh.clients.native import SSHClient, logger as ssh_logger
 from ssh2.session import Session
 from ssh2.exceptions import SocketDisconnectError
 from pssh.exceptions import AuthenticationException, ConnectionErrorException, \
-    SessionError, SFTPIOError, SFTPError, SCPError, PKeyFileError
+    SessionError, SFTPIOError, SFTPError, SCPError, PKeyFileError, Timeout
 
 
 ssh_logger.setLevel(logging.DEBUG)
@@ -145,3 +145,10 @@ def test_retry_failure(self):
         self.assertRaises(ConnectionErrorException,
                           SSHClient, self.host, port=12345,
                           num_retries=2, _auth_thread_pool=False)
+
+    def test_connection_timeout(self):
+        cmd = spawn(SSHClient, 'fakehost.com', port=12345,
+                    num_retries=1, timeout=1, _auth_thread_pool=False)
+        # Should fail within greenlet timeout, otherwise greenlet will
+        # raise timeout which will fail the test
+        self.assertRaises(ConnectionErrorException, cmd.get, timeout=1.1)