From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 9 Mar 2012 23:23:40 +0000 (+0100)
Subject: samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.
X-Git-Tag: tdb-1.2.10~270
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7320a5c900a263794cf1a4de55ce786e0f8fa317;p=thirdparty%2Fsamba.git

samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sat Mar 10 05:27:51 CET 2012 on sn-devel-104
---

diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py b/source4/scripting/python/samba/tests/samba_tool/base.py
index 628fd6c8876..489d6b54e4f 100644
--- a/source4/scripting/python/samba/tests/samba_tool/base.py
+++ b/source4/scripting/python/samba/tests/samba_tool/base.py
@@ -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"""