Cleanups, trying to get travis tests working

Author: pkittenis

.travis.yml

@@ -2,8 +2,6 @@ language: python
 python:
   - "2.6"
   - "2.7"
-before_install:
-  - sudo apt-get install -qq libevent-dev
 install:
   - pip install -r requirements.txt --use-mirrors
 script: nosetests

pssh.py

@@ -4,12 +4,12 @@
 See SSHClient and ParallelSSHClient"""
 
 import gevent.pool
-from gevent import monkey
-monkey.patch_all()
+from gevent import socket
 import paramiko
 import os
 import logging
-import socket
+from gevent import monkey
+monkey.patch_all()
 
 host_logger = logging.getLogger('host_logging')
 handler = logging.StreamHandler()

tests/test_pssh_client.py

@@ -21,8 +21,8 @@ def setUp(self):
     def test_pssh_client_exec_command(self):
         listen_port = random.randint(1026, 65534)
         server = gevent.spawn(listen, { self.fake_cmd : self.fake_resp }, listen_port = listen_port)
-        server.join(5)
         client = ParallelSSHClient(['localhost'], port=listen_port)
+        gevent.sleep(0)
         cmd = client.exec_command(self.fake_cmd)[0]
         output = client.get_stdout(cmd)
         expected = {'localhost' : {'exit_code' : 0}}
@@ -34,11 +34,13 @@ def test_pssh_client_exec_command(self):
     def test_pssh_client_auth_failure(self):
         listen_port = random.randint(2048, 65534)
         server = gevent.spawn(listen, { self.fake_cmd : self.fake_resp },
-                              listen_port=listen_port, fail_auth=True, )# link_callback=)
-        server.join(5)
+                              listen_port=listen_port, fail_auth=True, )
         client = ParallelSSHClient(['localhost'], port=listen_port)
+        gevent.sleep(0)
+        server.join(1)
         cmd = client.exec_command(self.fake_cmd)[0]
-        # Handle exception 
+        server.join(1)
+        # Handle exception
         try:
             cmd.get()
             raise Exception("Expected AuthenticationException, got none")