The branch, master has been updated via f7c8af7 samba.tests.dsdb: Import TestCase from samba.tests. via 1214e5f samba.tests: Make sure testtools is available before importing it. from f50aa98 Improve configure.in so it can be used outside the Samba source tree.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit f7c8af759909e472a5f9dcaa7f738c7151a57afc Author: Jelmer Vernooij <jel...@samba.org> Date: Thu Nov 17 02:31:13 2011 +0100 samba.tests.dsdb: Import TestCase from samba.tests. Autobuild-User: Jelmer Vernooij <jel...@samba.org> Autobuild-Date: Thu Nov 17 08:36:17 CET 2011 on sn-devel-104 commit 1214e5f23d2c7a79656440f11b9c9b9ac6d78f5c Author: Jelmer Vernooij <jel...@samba.org> Date: Thu Nov 17 02:30:38 2011 +0100 samba.tests: Make sure testtools is available before importing it. ----------------------------------------------------------------------- Summary of changes: source4/scripting/python/samba/tests/__init__.py | 2 ++ source4/scripting/python/samba/tests/dsdb.py | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) Changeset truncated at 500 lines: diff --git a/source4/scripting/python/samba/tests/__init__.py b/source4/scripting/python/samba/tests/__init__.py index 58e4130..ce2572f 100644 --- a/source4/scripting/python/samba/tests/__init__.py +++ b/source4/scripting/python/samba/tests/__init__.py @@ -28,6 +28,8 @@ from samba.samdb import SamDB import subprocess import tempfile +samba.ensure_external_module("testtools", "testtools") + # Other modules import these two classes from here, for convenience: from testtools.testcase import ( TestCase as TesttoolsTestCase, diff --git a/source4/scripting/python/samba/tests/dsdb.py b/source4/scripting/python/samba/tests/dsdb.py index d4331f3..b4f229f 100644 --- a/source4/scripting/python/samba/tests/dsdb.py +++ b/source4/scripting/python/samba/tests/dsdb.py @@ -22,7 +22,7 @@ from samba.credentials import Credentials from samba.samdb import SamDB from samba.auth import system_session -from testtools.testcase import TestCase +from samba.tests import TestCase from samba.ndr import ndr_unpack, ndr_pack from samba.dcerpc import drsblobs import ldb @@ -32,7 +32,6 @@ import samba class DsdbTests(TestCase): - def setUp(self): super(DsdbTests, self).setUp() self.lp = samba.param.LoadParm() @@ -43,11 +42,9 @@ class DsdbTests(TestCase): self.samdb = SamDB(os.path.join(self.baseprovpath(), "private", "sam.ldb"), session_info=self.session, credentials=self.creds,lp=self.lp) - def baseprovpath(self): return os.path.join(os.environ['SELFTEST_PREFIX'], "dc") - def test_get_oid_from_attrid(self): oid = self.samdb.get_oid_from_attid(591614) self.assertEquals(oid, "1.2.840.113556.1.4.1790") -- Samba Shared Repository