samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.
authorJelmer Vernooij <jelmer@samba.org>
Fri, 9 Mar 2012 23:23:40 +0000 (00:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 10 Mar 2012 04:27:51 +0000 (05:27 +0100)
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 10 05:27:51 CET 2012 on sn-devel-104

source4/scripting/python/samba/tests/samba_tool/base.py

index 628fd6c887629345c5598590a64cd6673fe45ba1..489d6b54e4f9e8b947bb0eba8e7d697652a77f2d 100644 (file)
@@ -28,7 +28,6 @@ from samba.samdb import SamDB
 from cStringIO import StringIO
 from samba.netcmd.main import cmd_sambatool
 import samba.tests
-from testtools.matchers import Contains
 
 class SambaToolCmdTest(samba.tests.TestCase):
 
@@ -89,7 +88,7 @@ class SambaToolCmdTest(samba.tests.TestCase):
         self.assertIsNotNone(val, msg)
 
     def assertMatch(self, base, string, msg=""):
-        self.assertThat(base, Contains(string), msg)
+        self.assertTrue(string in base, msg)
 
     def randomName(self, count=8):
         """Create a random name, cap letters and numbers, and always starting with a letter"""