sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

tests: SambaToolCmdTest.assertMatch() indicates what was asserted

Browse Source 
Signed-off-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Douglas Bagnall 2018-02-09 14:29:43 +13:00 committed by Andrew Bartlett
parent 597e755328
commit 72a81529aa
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
python/samba/tests/samba_tool/base.py
View File

@ -29,6 +29,13 @@ from cStringIO import StringIO
from samba.netcmd.main import cmd_sambatool from samba.netcmd.main import cmd_sambatool
import samba.tests 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): class SambaToolCmdTest(samba.tests.BlackboxTestCase):
def getSamDB(self, *argv): def getSamDB(self, *argv):
@ -88,7 +95,10 @@ class SambaToolCmdTest(samba.tests.BlackboxTestCase):
def assertCmdFail(self, val, msg=""): def assertCmdFail(self, val, msg=""):
self.assertIsNotNone(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) self.assertTrue(string in base, msg)
def randomName(self, count=8): def randomName(self, count=8):