[dts] [PATCH V1] fix scp error on FreeBSD
xu,gang
gangx.xu at intel.com
Tue Oct 25 08:22:26 CEST 2016
when scp something to FreeBSD the prompt is different with other
ex:FreeBSD is "Password for root at freeBSD:"
Fedora is "root at xx.xxx.xxx.xxx's password:"
Signed-off-by: xu,gang <gangx.xu at intel.com>
---
framework/ssh_pexpect.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/framework/ssh_pexpect.py b/framework/ssh_pexpect.py
index 1abf8a1..7bad5f5 100644
--- a/framework/ssh_pexpect.py
+++ b/framework/ssh_pexpect.py
@@ -176,11 +176,11 @@ class SSHPexpect(object):
p = pexpect.spawn(scp_cmd)
time.sleep(0.5)
ssh_newkey = 'Are you sure you want to continue connecting'
- i = p.expect([ssh_newkey, 'password: ', "# ", pexpect.EOF,
+ i = p.expect([ssh_newkey, '.*ssword', "# ", pexpect.EOF,
pexpect.TIMEOUT], 120)
if i == 0: # add once in trust list
p.sendline('yes')
- i = p.expect([ssh_newkey, '[pP]assword: ', pexpect.EOF], 2)
+ i = p.expect([ssh_newkey, '.*ssword', pexpect.EOF], 2)
if i == 1:
time.sleep(0.5)
--
1.9.3
More information about the dts
mailing list