From: Douglas Bagnall Date: Fri, 9 Feb 2018 10:09:41 +0000 (+1300) Subject: tests/samba-tool user wdigest: fix a flapping test X-Git-Tag: tevent-0.9.36~139 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cb920dd8732af30a7f74d5b492ea6ddfc2adfcbd;p=thirdparty%2Fsamba.git tests/samba-tool user wdigest: fix a flapping test The output of something like samba-tool user getpassword $USER --attributes virtualWDigest01 contains an LDIF section with long strings folded on the 77th column. To unfold this LDIF we were using: result = re.sub(r"\n\s*", '', out) which worked fine EXCEPT when a space in the output happened to land immediately after the fold and got eaten by the \s*. Instead we remove just a single space after the line break, because that is always what fold_string() in lib/ldb/common/ldb_ldif.c inserts, and for this simple replacement we don't need the re module. Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett Autobuild-User(master): Andrew Bartlett Autobuild-Date(master): Mon Feb 12 05:21:01 CET 2018 on sn-devel-144 --- diff --git a/python/samba/tests/samba_tool/user_wdigest.py b/python/samba/tests/samba_tool/user_wdigest.py index 497855c7b73..35283ebfcb3 100644 --- a/python/samba/tests/samba_tool/user_wdigest.py +++ b/python/samba/tests/samba_tool/user_wdigest.py @@ -31,7 +31,6 @@ from samba import ( from samba.ndr import ndr_unpack from samba.dcerpc import drsblobs from hashlib import md5 -import re import random import string @@ -105,8 +104,8 @@ class UserCmdWdigestTestCase(SambaToolCmdTest): if missing: self.assertTrue(attribute not in out) else: - result = re.sub(r"\n\s*", '', out) - self.assertMatch(result, "%s: %s" % (attribute, expected)) + self.assertMatch(out.replace('\n ', ''), + "%s: %s" % (attribute, expected)) def test_Wdigest_no_suffix(self): attribute = "virtualWDigest"