Attempt 4 on fixing fake server tests on travis

Author: pkittenis

pssh.py

@@ -107,6 +107,7 @@ def _connect(self):
                                                                     self.port,))
         except paramiko.AuthenticationException, e:
             raise AuthenticationException(e)
+        gevent.sleep(0)
 
     def exec_command(self, command, sudo=False, **kwargs):
         """Wrapper to :mod:`paramiko.SSHClient.exec_command`
@@ -146,6 +147,7 @@ def _make_sftp(self):
         """Make SFTP client from open transport"""
         transport = self.client.get_transport()
         channel = transport.open_session()
+        gevent.sleep(0)
         return paramiko.SFTPClient.from_transport(transport)
 
     def mkdir(self, sftp, directory):
@@ -162,6 +164,7 @@ def mkdir(self, sftp, directory):
         except IOError, error:
             logger.error("Error occured creating directory on %s - %s",
                          self.host, error)
+        gevent.sleep(0)
 
     def copy_file(self, local_file, remote_file):
         """Copy local file to host via SFTP/SCP
@@ -192,6 +195,7 @@ def copy_file(self, local_file, remote_file):
         else:
             logger.info("Copied local file %s to remote destination %s:%s",
                         local_file, self.host, remote_file)
+        gevent.sleep(0)
 
 class ParallelSSHClient(object):
     """

requirements.txt

@@ -1,2 +1,2 @@
 paramiko
-gevent
+gevent>=1

tests/test_pssh_client.py

@@ -8,6 +8,8 @@
 from fake_server.fake_server import listen, make_socket, logger as server_logger
 import random
 import logging
+import gevent
+import threading
 
 _setup_logger(server_logger)
 
@@ -22,20 +24,17 @@ def setUp(self):
     def cleanUp(self):
         del self.listener
 
-    def test_pssh_client_exec_command(self):
-        server = listen({ self.fake_cmd : self.fake_resp }, self.listener)
+    def _run_client_exec_command(self):
         client = ParallelSSHClient(['localhost'], port=self.listen_port)
         cmd = client.exec_command(self.fake_cmd)[0]
         output = client.get_stdout(cmd)
         expected = {'localhost' : {'exit_code' : 0}}
         self.assertEqual(expected, output,
                          msg = "Got unexpected command output - %s" % (output,))
+        gevent.sleep(0)
         del client
-        server.join()
 
-    def test_pssh_client_auth_failure(self):
-        server = listen({ self.fake_cmd : self.fake_resp },
-                        self.listener, fail_auth=True)
+    def _run_client_fail_auth(self):
         client = ParallelSSHClient(['localhost'], port=self.listen_port)
         cmd = client.exec_command(self.fake_cmd)[0]
         # Handle exception
@@ -45,4 +44,18 @@ def test_pssh_client_auth_failure(self):
         except AuthenticationException:
             pass
         del client
+
+    def test_pssh_client_exec_command(self):
+        server = listen({ self.fake_cmd : self.fake_resp }, self.listener)
+        client = threading.Thread(target=self._run_client_exec_command)
+        client.start()
+        client.join()
+        server.join()
+
+    def test_pssh_client_auth_failure(self):
+        server = listen({ self.fake_cmd : self.fake_resp },
+                        self.listener, fail_auth=True)
+        client = threading.Thread(target=self._run_client_fail_auth)
+        client.start()
+        client.join()
         server.join()