From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 1 Dec 2010 05:07:56 +0000 (+1100)
Subject: wintest: make command matching case insensitive by default
X-Git-Tag: samba-4.0.0alpha14~567
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=9c84f987acb5ffc97a612839e13e8b8042e6120e;p=vlendec%2Fsamba-autobuild%2F.git

wintest: make command matching case insensitive by default

the new BASEDN changes break the RODC join otherwise

Autobuild-User: Andrew Tridgell <tridge@samba.org>
Autobuild-Date: Wed Dec  1 06:54:13 CET 2010 on sn-devel-104
---

diff --git a/wintest/wintest.py b/wintest/wintest.py
index 5f7bd0a8d53..4ba4b4dc9a7 100644
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -177,7 +177,7 @@ class wintest():
         return self.run_cmd(cmd, output=True)
 
     def cmd_contains(self, cmd, contains, nomatch=False, ordered=False, regex=False,
-                     casefold=False):
+                     casefold=True):
         '''check that command output contains the listed strings'''
 
         if isinstance(contains, str):
@@ -187,6 +187,9 @@ class wintest():
         self.info(out)
         for c in self.substitute(contains):
             if regex:
+                if casefold:
+                    c = c.upper()
+                    out = out.upper()
                 m = re.search(c, out)
                 if m is None:
                     start = -1
@@ -210,7 +213,7 @@ class wintest():
                 out = out[end:]
 
     def retry_cmd(self, cmd, contains, retries=30, delay=2, wait_for_fail=False,
-                  ordered=False, regex=False, casefold=False):
+                  ordered=False, regex=False, casefold=True):
         '''retry a command a number of times'''
         while retries > 0:
             try: