[SCM] Samba Shared Repository - branch master updated

Jelmer Vernooij jelmer at samba.org
Fri Mar 9 21:28:02 MST 2012


The branch, master has been updated
       via  7320a5c samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.
       via  b703267 samba.tests.samba_tool.user: Remove unused imports.
      from  981e977 Ensure the right tsocket.h is included.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 7320a5c900a263794cf1a4de55ce786e0f8fa317
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Mar 10 00:23:40 2012 +0100

    samba.tests.samba_tool.base: Avoid unnecessary call to testtools.matchers.Contains.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Sat Mar 10 05:27:51 CET 2012 on sn-devel-104

commit b703267dfc731d659453e56aa54e49cc4e442f98
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Mar 10 00:23:18 2012 +0100

    samba.tests.samba_tool.user: Remove unused imports.

-----------------------------------------------------------------------

Summary of changes:
 .../python/samba/tests/samba_tool/base.py          |    3 +--
 .../python/samba/tests/samba_tool/user.py          |    2 --
 2 files changed, 1 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/scripting/python/samba/tests/samba_tool/base.py b/source4/scripting/python/samba/tests/samba_tool/base.py
index 628fd6c..489d6b5 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"""
diff --git a/source4/scripting/python/samba/tests/samba_tool/user.py b/source4/scripting/python/samba/tests/samba_tool/user.py
index 4fe43e5..2e7c2b9 100644
--- a/source4/scripting/python/samba/tests/samba_tool/user.py
+++ b/source4/scripting/python/samba/tests/samba_tool/user.py
@@ -18,8 +18,6 @@
 #
 
 import os
-import sys
-import pprint
 import time
 import ldb
 from samba.tests.samba_tool.base import SambaToolCmdTest


-- 
Samba Shared Repository


More information about the samba-cvs mailing list