Test

This is to be done 10pm Mondayt 21 Sept 2020 to minimise interuption and allow Chris to recover if things go sideways.

tes/sshwrapper/__init__.py

@@ -353,7 +353,7 @@ class Ssh:
             ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport)
         else:
             ctrlsocket = Ssh.get_ctrl_master_socket(sess, bastion, user, bastionsshport)
-        logger.debug('in execute, got my ctrlsocket {}'.format(sess.control_processes[ctrlsocket].pid))
+        logger.debug('in execute, got my ctrlsocket {}'.format(sess.ctrl_processes[ctrlsocket].pid))
         if bastion == None:
             # we are executing this command on the login node, so no more magic is needed
             sshcmd = Ssh.SSHCMDWITHOPTS.copy()
@@ -443,7 +443,7 @@ class Ssh:
         Ssh.validate_username(user)
         Ssh.validate_hostname(host)
         ctrlsocket = Ssh.get_ctrl_master_socket(sess, host, user, sshport)
-        logger.debug('in tunnel, got my ctrlsocket {}'.format(sess.control_processes[ctrlsocket].pid))
+        logger.debug('in tunnel, got my ctrlsocket {}'.format(sess.ctrl_processes[ctrlsocket].pid))
         localport = Ssh.get_free_port()
 
         if port == 22 or (not internalfirewall and not localbind):