commit 64e0a276634a69e84bea5370163201d1344e2c41
author Jon Hall <jhall@onlab.us> Tue Jun 30 09:57:49 2015 -0700
committer Jon Hall <jhall@onlab.us> Tue Jun 30 09:57:49 2015 -0700
tree bb781ec7378b168e1966b98ce0391d43f1488d07
parent d9e0247e2e96b50b5f966a2eab1d0e60b2958892
parent 32de0bc6320a4ce6f307aa544b4ae5bf0c662814

Merge pull request #139 from opennetworkinglab/devl/SSHConnectBug

Devl/ssh connect bug

TestON/drivers/common/clidriver.py

diff --git a/TestON/drivers/common/clidriver.py b/TestON/drivers/common/clidriver.py
index 3b94ef7..f75df5f 100644
--- a/TestON/drivers/common/clidriver.py
+++ b/TestON/drivers/common/clidriver.py
@@ -80,7 +80,7 @@
         i = 5
         while i == 5:
             i = self.handle.expect( [
-				    ssh_newkey,
+                                    ssh_newkey,
                                     'password:|Password:',
                                     pexpect.EOF,
                                     pexpect.TIMEOUT,
@@ -88,11 +88,11 @@
                                     'teston>',
                                     '>|#|\$' ],
                 		    120 )
-            if i == 0:
+            if i == 0:  # Accept key, then expect either a password prompt or access
                 main.log.info( "ssh key confirmation received, send yes" )
                 self.handle.sendline( 'yes' )
-                i = self.handle.expect(
-                    [ ssh_newkey, 'password:', pexpect.EOF ] )
+                i = 5  # Run the loop again
+                continue 
             if i == 1:
                 if self.pwd:
                     main.log.info(