summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-24 18:38:45 +0200
commitedeb20b92128f1859d2d8ecee820846ac5799ed5 (patch)
treeb7c66bf4da6bbe5628fc25def555448d1789b5b1 /source4/lib
parentda01822671b3a553fd805315df7322b8225cfe95 (diff)
parentd2062ab74f7684f8b6975a7415fac23389851278 (diff)
downloadsamba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.gz
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.tar.bz2
samba-edeb20b92128f1859d2d8ecee820846ac5799ed5.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
Conflicts: source3/include/includes.h
Diffstat (limited to 'source4/lib')
-rwxr-xr-xsource4/lib/ldb/tests/python/ldap.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py
index bc6f80e856..6c910b63f1 100755
--- a/source4/lib/ldb/tests/python/ldap.py
+++ b/source4/lib/ldb/tests/python/ldap.py
@@ -781,7 +781,10 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + self.base_dn + """
self.assertTrue("objectGuid" not in res[0])
self.assertTrue("whenCreated" in res[0])
self.assertTrue("nTSecurityDescriptor" in res[0])
- self.assertEquals(res[0]["member"][0].upper(), ("CN=ldaptestuser2,CN=Users," + self.base_dn).upper())
+ memberUP = []
+ for m in res[0]["member"]:
+ memberUP.append(m.upper())
+ self.assertTrue(("CN=ldaptestuser2,CN=Users," + self.base_dn).upper() in memberUP)
ldb.modify_ldif("""
dn: cn=ldaptestgroup2,cn=users,""" + self.base_dn + """