summaryrefslogtreecommitdiff
path: root/source4/dsdb/samdb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-12-21 23:05:35 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-12-21 23:05:35 +0100
commit2227860a793dbde0b41e6ba1a720ac0d161ad784 (patch)
tree31e9701e978e4355362c199863d11ce52c04d5db /source4/dsdb/samdb
parentd75c51eef34836f9eb5fa3449cef31f6463ce470 (diff)
downloadsamba-2227860a793dbde0b41e6ba1a720ac0d161ad784.tar.gz
samba-2227860a793dbde0b41e6ba1a720ac0d161ad784.tar.bz2
samba-2227860a793dbde0b41e6ba1a720ac0d161ad784.zip
Fix more tests, improve repr() functions for various Python types.
Diffstat (limited to 'source4/dsdb/samdb')
-rw-r--r--source4/dsdb/samdb/ldb_modules/tests/samba3sam.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
index be192f8e74..75aaeb7366 100644
--- a/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/samba3sam.py
@@ -28,7 +28,6 @@ from ldb import SCOPE_DEFAULT, SCOPE_BASE, SCOPE_SUBTREE
from samba import Ldb, substitute_var
from samba.tests import LdbTestCase, TestCaseInTempDir, cmdline_loadparm
import samba.dcerpc.security
-import samba.security
import samba.ndr
datadir = os.path.join(os.path.dirname(__file__),
@@ -118,14 +117,8 @@ class MapBaseTestCase(TestCaseInTempDir):
def assertSidEquals(self, text, ndr_sid):
sid_obj1 = samba.ndr.ndr_unpack(samba.dcerpc.security.dom_sid,
str(ndr_sid[0]))
- sid_obj2 = samba.security.Sid(text)
- # For now, this is the only way we can compare these since the
- # classes are in different places. Should reconcile that at some point.
- self.assertEquals(sid_obj1.sid_rev_num, sid_obj2.sid_rev_num)
- self.assertEquals(sid_obj1.num_auths, sid_obj2.num_auths)
- # FIXME: self.assertEquals(sid_obj1.id_auth, sid_obj2.id_auth)
- # FIXME: self.assertEquals(sid_obj1.sub_auths[:sid_obj1.num_auths],
- # sid_obj2.sub_auths[:sid_obj2.num_auths])
+ sid_obj2 = samba.dcerpc.security.dom_sid(text)
+ self.assertEquals(sid_obj1, sid_obj2)
class Samba3SamTestCase(MapBaseTestCase):