Updated tests to use pssh.agent for agent tests. Removed fake agent from embedded server

Author: Dan

embedded_server/fake_agent.py

@@ -15,6 +15,7 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+import paramiko.agent
 
 class SSHAgent(paramiko.agent.AgentSSH):
     """:mod:`paramiko.agent.AgentSSH` compatible class for programmatically

pssh/agent.py

@@ -36,7 +36,7 @@
 from pssh.utils import load_private_key
 from embedded_server.embedded_server import start_server, make_socket, \
      logger as server_logger, paramiko_logger, start_server_from_ip
-from embedded_server.fake_agent import FakeAgent
+from pssh.agent import SSHAgent
 from paramiko import RSAKey
 
 PKEY_FILENAME = os.path.sep.join([os.path.dirname(__file__), 'test_client_private_key'])
@@ -57,7 +57,7 @@ def setUp(self):
         self.server_sock = make_socket(self.host)
         self.listen_port = self.server_sock.getsockname()[1]
         self.server = start_server(self.server_sock)
-        self.agent = FakeAgent()
+        self.agent = SSHAgent()
         self.agent.add_key(USER_KEY)
         self.client = ParallelSSHClient([self.host], port=self.listen_port,
                                         pkey=self.user_key,
@@ -73,6 +73,7 @@ def make_random_port(self, host=None):
     def tearDown(self):
         del self.client
         self.server.kill()
+        del self.agent
 
     def test_pssh_client_no_stdout_non_zero_exit_code_immediate_exit(self):
         output = self.client.run_command('exit 1')
@@ -533,7 +534,6 @@ def test_ssh_proxy(self):
         self.server.kill()
         server, _ = start_server_from_ip(self.host, port=self.listen_port)
         proxy_host = '127.0.0.2'
-        proxy_server_port = self.make_random_port(proxy_host)
         proxy_server, proxy_server_port = start_server_from_ip(proxy_host)
         client = ParallelSSHClient([self.host], port=self.listen_port,
                                    pkey=self.user_key,

tests/test_pssh_client.py

@@ -30,7 +30,7 @@
      logger, ConnectionErrorException, UnknownHostException, SSHException, utils
 from embedded_server.embedded_server import start_server, make_socket, logger as server_logger, \
      paramiko_logger
-from embedded_server.fake_agent import FakeAgent
+from pssh.agent import SSHAgent
 import paramiko
 import os
 from test_pssh_client import USER_KEY
@@ -250,7 +250,7 @@ def test_ssh_agent_authentication(self):
         instead override the client's agent with our own fake SSH agent,
         add our to key to agent and try to login to server.
         Key should be automatically picked up from the overriden agent"""
-        agent = FakeAgent()
+        agent = SSHAgent()
         agent.add_key(USER_KEY)
         client = SSHClient(self.host, port=self.listen_port,
                            agent=agent)
@@ -261,6 +261,9 @@ def test_ssh_agent_authentication(self):
         self.assertEqual(expected, output,
                          msg = "Got unexpected command output - %s" % (output,))
         del client
+        agent._connect(None)
+        agent._close()
+        del agent
 
     def test_ssh_client_conn_failure(self):
         """Test connection error failure case - ConnectionErrorException"""