From: Douglas Bagnall Date: Fri, 9 Feb 2018 01:29:43 +0000 (+1300) Subject: tests: SambaToolCmdTest.assertMatch() indicates what was asserted X-Git-Tag: tevent-0.9.36~140 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72a81529aa13ac34a6dc1b1cdc37d1329af48ffe;p=thirdparty%2Fsamba.git tests: SambaToolCmdTest.assertMatch() indicates what was asserted Signed-off-by: Douglas Bagnall Reviewed-by: Andrew Bartlett --- diff --git a/python/samba/tests/samba_tool/base.py b/python/samba/tests/samba_tool/base.py index c57e9e94a1b..de257e3db09 100644 --- a/python/samba/tests/samba_tool/base.py +++ b/python/samba/tests/samba_tool/base.py @@ -29,6 +29,13 @@ from cStringIO import StringIO from samba.netcmd.main import cmd_sambatool import samba.tests + +def truncate_string(s, cutoff=100): + if len(s) < cutoff + 15: + return s + return s[:cutoff] + '[%d more characters]' % (len(s) - cutoff) + + class SambaToolCmdTest(samba.tests.BlackboxTestCase): def getSamDB(self, *argv): @@ -88,7 +95,10 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase): def assertCmdFail(self, val, msg=""): self.assertIsNotNone(val, msg) - def assertMatch(self, base, string, msg=""): + def assertMatch(self, base, string, msg=None): + if msg is None: + msg = "%r is not in %r" % (truncate_string(string), + truncate_string(base)) self.assertTrue(string in base, msg) def randomName(self, count=8):