The branch, master has been updated
via 66fa21ef73464188f5cb20e5fc96c5aa35d434b6 (commit)
via ea1ff069a53a53b0251179dca30ce52dd8b56a23 (commit)
from 45c67ff244a4a40b8fd099b3cbdc135a527c30eb (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 66fa21ef73464188f5cb20e5fc96c5aa35d434b6
Merge: ea1ff069a53a53b0251179dca30ce52dd8b56a23
45c67ff244a4a40b8fd099b3cbdc135a527c30eb
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Jan 7 21:45:49 2009 +0100
Merge branch 'master' of ssh://git.samba.org/data/git/samba
commit ea1ff069a53a53b0251179dca30ce52dd8b56a23
Author: Jelmer Vernooij <jel...@samba.org>
Date: Wed Jan 7 11:06:00 2009 +0100
Fix ldap.py test.
-----------------------------------------------------------------------
Summary of changes:
source4/lib/ldb/tests/python/ldap.py | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/lib/ldb/tests/python/ldap.py
b/source4/lib/ldb/tests/python/ldap.py
index f0b5000..12a2b3f 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -650,7 +650,7 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" +
self.base_dn + """
self.assertEquals(str(res[0].dn), ("CN=ldaptestuser,CN=Users," +
self.base_dn))
self.assertEquals(str(res[0]["cn"]), "ldaptestuser")
self.assertEquals(str(res[0]["name"]), "ldaptestuser")
- self.assertEquals(str(res[0]["objectClass"]), ["top", "person",
"organizationalPerson", "user"])
+ self.assertEquals(set(res[0]["objectClass"]), set(["top", "person",
"organizationalPerson", "user"]))
self.assertTrue("objectGUID" in res[0])
self.assertTrue("whenCreated" in res[0])
self.assertEquals(str(res[0]["objectCategory"]),
("CN=Person,CN=Schema,CN=Configuration," + self.base_dn))
@@ -694,10 +694,10 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" +
self.base_dn + """
self.assertEquals(str(res[0].dn), ("CN=ldaptestcomputer,CN=Computers,"
+ self.base_dn))
self.assertEquals(str(res[0]["cn"]), "ldaptestcomputer")
self.assertEquals(str(res[0]["name"]), "ldaptestcomputer")
- self.assertEquals(str(res[0]["objectClass"]), ["top", "person",
"organizationalPerson", "user", "computer"])
+ self.assertEquals(set(res[0]["objectClass"]), set(["top", "person",
"organizationalPerson", "user", "computer"]))
self.assertTrue("objectGUID" in res[0])
self.assertTrue("whenCreated" in res[0])
- self.assertEquals(res[0]["objectCategory"],
("CN=Computer,CN=Schema,CN=Configuration," + self.base_dn))
+ self.assertEquals(str(res[0]["objectCategory"]),
("CN=Computer,CN=Schema,CN=Configuration," + self.base_dn))
self.assertEquals(int(res[0]["primaryGroupID"][0]), 513)
self.assertEquals(int(res[0]["sAMAccountType"][0]), 805306368)
self.assertEquals(int(res[0]["userAccountControl"][0]), 546)
@@ -754,7 +754,7 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" +
self.base_dn + """
res =
ldb.search(expression="(&(cn=ldaptest2computer)(objectClass=user))")
self.assertEquals(len(res), 1, "Could not find
(&(cn=ldaptest2computer)(objectClass=user))")
- self.assertEquals(res[0].dn, ("CN=ldaptest2computer,CN=Computers," +
self.base_dn))
+ self.assertEquals(str(res[0].dn), "CN=ldaptest2computer,CN=Computers,"
+ self.base_dn)
self.assertEquals(str(res[0]["cn"]), "ldaptest2computer")
self.assertEquals(str(res[0]["name"]), "ldaptest2computer")
self.assertEquals(list(res[0]["objectClass"]), ["top", "person",
"organizationalPerson", "user", "computer"])
@@ -771,7 +771,7 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" +
self.base_dn + """
res_user = ldb.search(self.base_dn,
expression="(&(cn=ldaptestUSer2)(objectClass=user))", scope=SCOPE_SUBTREE,
attrs=attrs)
self.assertEquals(len(res_user), 1, "Could not find
(&(cn=ldaptestUSer2)(objectClass=user))")
- self.assertEquals(res_user[0].dn, ("CN=ldaptestuser2,CN=Users," +
self.base_dn))
+ self.assertEquals(str(res_user[0].dn), ("CN=ldaptestuser2,CN=Users," +
self.base_dn))
self.assertEquals(str(res_user[0]["cn"]), "ldaptestuser2")
self.assertEquals(str(res_user[0]["name"]), "ldaptestuser2")
self.assertEquals(list(res_user[0]["objectClass"]), ["top", "person",
"organizationalPerson", "user"])
@@ -791,7 +791,7 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" +
self.base_dn + """
res = ldb.search(self.base_dn,
expression="(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE,
attrs=attrs)
self.assertEquals(len(res), 1, "Could not find
(&(cn=ldaptestgroup2)(objectClass=group))")
- self.assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
+ self.assertEquals(str(res[0].dn), ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
self.assertEquals(str(res[0]["cn"]), "ldaptestgroup2")
self.assertEquals(str(res[0]["name"]), "ldaptestgroup2")
self.assertEquals(list(res[0]["objectClass"]), ["top", "group"])
@@ -871,7 +871,7 @@ member: CN=ldaptestutf8user èùéìòà ,CN=Users,""" +
self.base_dn + """
res = ldb.search(self.base_dn,
expression="(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE,
attrs=attrs)
self.assertEquals(len(res), 1, "Could not find
(&(cn=ldaptestgroup2)(objectClass=group))")
- self.assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
+ self.assertEquals(str(res[0].dn), ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
self.assertEquals(res[0]["member"][0], ("CN=ldaptestuser2,CN=Users," +
self.base_dn))
self.assertEquals(len(res[0]["member"]), 1)
@@ -884,7 +884,7 @@ member: CN=ldaptestutf8user èùéìòà ,CN=Users,""" +
self.base_dn + """
res = ldb.search(self.base_dn,
expression="(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE,
attrs=attrs)
self.assertEquals(len(res), 1, "Could not find
(&(cn=ldaptestgroup2)(objectClass=group)) to check linked delete")
- self.assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
+ self.assertEquals(str(res[0].dn), ("CN=ldaptestgroup2,CN=Users," +
self.base_dn))
self.assertTrue("member" not in res[0])
print "Testing ldb.search for (&(cn=ldaptestutf8user
ÃÃÃÃÃÃ)(objectClass=user))"
--
Samba Shared Repository
