Use separate process for fake server

Author: pkittenis

fake_server/fake_server.py

@@ -8,9 +8,10 @@
 paramiko repository
 """
 
+import multiprocessing
 import os
 import socket
-import threading
+# import threading
 from threading import Event
 import sys
 import traceback
@@ -90,9 +91,9 @@ def listen(cmd_req_response, sock, fail_auth = False):
         logger.error('*** Listen failed: %s' % (str(e),))
         traceback.print_exc()
         return
-    accept_thread = threading.Thread(target=handle_ssh_connection,
-                                     args=(cmd_req_response, sock,),
-                                     kwargs={'fail_auth' : fail_auth},)
+    accept_thread = multiprocessing.Process(target=handle_ssh_connection,
+                                            args=(cmd_req_response, sock,),
+                                            kwargs={'fail_auth' : fail_auth},)
     accept_thread.start()
     return accept_thread
 
@@ -146,4 +147,8 @@ def handle_ssh_connection(cmd_req_response, sock, fail_auth = False):
     logger.setLevel(logging.DEBUG)
     sock = make_socket('127.0.0.1')
     server = listen({'fake' : 'fake response' + os.linesep}, sock)
-    server.join()
+    try:
+        server.join()
+    except KeyboardInterrupt:
+        sys.exit(0)
+        

tests/test_pssh_client.py

@@ -10,7 +10,6 @@
 import logging
 import gevent
 import threading
-import time
 
 _setup_logger(server_logger)
 
@@ -25,38 +24,22 @@ def setUp(self):
     def cleanUp(self):
         del 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
-
-    # def _run_client_fail_auth(self):
-    #     try:
-    #     except Exception:
-    #         raise SystemExit
-
     def test_pssh_client_exec_command(self):
         server = listen({ self.fake_cmd : self.fake_resp }, self.listener)
-        time.sleep(5)
+        gevent.sleep(5)
         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)
-        time.sleep(5)
+        gevent.sleep(5)
         client = ParallelSSHClient(['localhost'], port=self.listen_port)
         cmd = client.exec_command(self.fake_cmd)[0]
         # Handle exception