sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

wintest: make expect calls case insensitive by default

Browse Source
This commit is contained in:
Andrew Tridgell 2010-11-30 11:55:48 +11:00
parent 1079195a76
commit 7526171ce5
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
wintest/wintest.py
View File

@ -216,23 +216,26 @@ class wintest():
self.info("retrying (retries=%u delay=%u)" % (retries, delay))
raise RuntimeError("Failed to find %s" % contains)
def pexpect_spawn(self, cmd, timeout=60, crlf=True):
def pexpect_spawn(self, cmd, timeout=60, crlf=True, casefold=True):
'''wrapper around pexpect spawn'''
cmd = self.substitute(cmd)
self.info("$ " + cmd)
ret = pexpect.spawn(cmd, logfile=sys.stdout, timeout=timeout)
def sendline_sub(line):
line = self.substitute(line).replace('\n', '\r\n')
return ret.old_sendline(line + '\r')
def expect_sub(line, timeout=ret.timeout):
line = self.substitute(line)
if crlf:
line = line.replace('\n', '\r\n') + '\r'
return ret.old_sendline(line)
def expect_sub(line, timeout=ret.timeout, casefold=casefold):
line = self.substitute(line)
if casefold:
line = "(?i)" + line
return ret.old_expect(line, timeout=timeout)
if crlf:
ret.old_sendline = ret.sendline
ret.sendline = sendline_sub
ret.old_sendline = ret.sendline
ret.sendline = sendline_sub
ret.old_expect = ret.expect
ret.expect = expect_sub