Merged variable substitution fix

Author: Dan

fake_server/fake_server.py

@@ -95,8 +95,9 @@ def check_channel_forward_agent_request(self, channel):
     def check_channel_exec_request(self, channel, cmd):
         logger.debug("Got exec request on channel %s for cmd %s" % (channel, cmd,))
         # Remove any 'bash -c' and/or quotes from command
-        cmd = cmd.replace('bash -c \"', "")
+        cmd = cmd.replace('bash -c ', "")
         cmd = cmd.replace('\"', "")
+        cmd = cmd.replace('\'', "")
         if not cmd in self.cmd_req_response:
             return False
         self.event.set()

pssh.py

@@ -240,12 +240,12 @@ def exec_command(self, command, sudo=False, user=None, **kwargs):
                          self._read_output_buffer(_stderr,
                                                   prefix='\t[err]')
         if sudo and not user:
-            command = 'sudo -S bash -c "%s"' % command.replace('"', '\\"')
+            command = 'sudo -S bash -c \'%s\'' % command.replace('"', '\\"')
         elif user:
-            command = 'sudo -u %s -S bash -c "%s"' % (
+            command = 'sudo -u %s -S bash -c \'%s\'' % (
                 user, command.replace('"', '\\"'),)
         else:
-            command = 'bash -c "%s"' % command.replace('"', '\\"')
+            command = 'bash -c \'%s\'' % command.replace('"', '\\"')
         logger.debug("Running command %s on %s", command, self.host)
         channel.exec_command(command, **kwargs)
         logger.debug("Command started")
@@ -320,7 +320,7 @@ class ParallelSSHClient(object):
 
     def __init__(self, hosts,
                  user=None, password=None, port=None, pkey=None,
-                 forward_ssh_agent=True, num_retries=DEFAULT_RETRIES, timeout=None,
+                 forward_ssh_agent=True, num_retries=DEFAULT_RETRIES, timeout=120,
                  pool_size=10, proxy_host=None, proxy_port=22):
         """
         :param hosts: Hosts to connect to