summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-11-03 18:43:38 +0100
committerJelmer Vernooij <jelmer@samba.org>2010-11-03 19:13:35 +0000
commit46bca5e7b7a4b7aea57ed8db6d4b2927f1188ae6 (patch)
treee541474fa2e9dd2c3a278bdd8d501cbfbd576413
parent9ae3c822d18cea4710d8d7cec265bd9ecdea35a4 (diff)
downloadsamba-46bca5e7b7a4b7aea57ed8db6d4b2927f1188ae6.tar.gz
samba-46bca5e7b7a4b7aea57ed8db6d4b2927f1188ae6.tar.bz2
samba-46bca5e7b7a4b7aea57ed8db6d4b2927f1188ae6.zip
possibleinferiors: Report subunit.
-rwxr-xr-xsource4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py12
1 files changed, 8 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
index 5fc36628e5..b1c4c2e2a3 100755
--- a/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
+++ b/source4/dsdb/samdb/ldb_modules/tests/possibleinferiors.py
@@ -87,7 +87,7 @@ def possible_inferiors_search(db, oc):
poss.append(str(item))
poss = uniq_list(poss)
poss.sort()
- return poss;
+ return poss
@@ -104,7 +104,7 @@ def supclasses(classinfo, oc):
return list
if classinfo[oc].get("SUPCLASSES") is not None:
return classinfo[oc]["SUPCLASSES"]
- res = classinfo[oc]["subClassOf"];
+ res = classinfo[oc]["subClassOf"]
for r in res:
list.append(r)
list.extend(supclasses(classinfo,r))
@@ -222,16 +222,20 @@ def possible_inferiors_constructed(db, classinfo, c):
def test_class(db, classinfo, oc):
"""test to see if one objectclass returns the correct possibleInferiors"""
- print "Testing objectClass %s" % oc
+ print "test: objectClass.%s" % oc
poss1 = possible_inferiors_search(db, oc)
poss2 = possible_inferiors_constructed(db, classinfo, oc)
if poss1 != poss2:
+ print "failure: objectClass.%s [" % oc
print "Returned incorrect list for objectclass %s" % oc
print "search: %s" % poss1
print "constructed: %s" % poss2
for i in range(0,min(len(poss1),len(poss2))):
print "%30s %30s" % (poss1[i], poss2[i])
- exit(1)
+ print "]"
+ sys.exit(1)
+ else:
+ print "success: objectClass.%s" % oc
def get_object_classes(db):
"""return a list of all object classes"""