The branch, v4-0-test has been updated via cbf3b74e5f5076d864b08c772f21b20751ea5163 (commit) via 874c00b1c1ef011c85226135144fafdc97d91116 (commit) via 355878907970b396e4031426fda260d981c417eb (commit) via 3a0d14f33532d88ace770d037c50375fe822dbb6 (commit) via 017aa400c7097cf6132f2bec969b9bbb5237f4d8 (commit) via 0c27eabbc40657493dc72f12b4fbdb07b0a3200f (commit) via 52f64afd4324eb185303ca192b88ccb632ee8587 (commit) via d7a3f9612c40000cb265279598c09f6983305656 (commit) via 74209fa6b097c6cd3c919dc6a67d998de12fa575 (commit) via 583881ae5a2a173abad9ba1ffd766b009d9ca8cd (commit) via d029c0bedf8b3d300050786991e2df0e446fca72 (commit) from 9eddc27f13fa2feb56d6b015e66d8c54081487da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test - Log ----------------------------------------------------------------- commit cbf3b74e5f5076d864b08c772f21b20751ea5163 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 04:07:14 2008 +0100 Python: Update STATUS. commit 874c00b1c1ef011c85226135144fafdc97d91116 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 04:06:00 2008 +0100 ldap/python: Fix last tests. commit 355878907970b396e4031426fda260d981c417eb Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 04:05:41 2008 +0100 ldb/python: Support comparing Dn's to strings. commit 3a0d14f33532d88ace770d037c50375fe822dbb6 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 02:06:30 2008 +0100 python/ldap: Fix a couple more tests. commit 017aa400c7097cf6132f2bec969b9bbb5237f4d8 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 01:47:32 2008 +0100 Make a few more tests pass. commit 0c27eabbc40657493dc72f12b4fbdb07b0a3200f Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 01:01:36 2008 +0100 python/ldap: Get further. commit 52f64afd4324eb185303ca192b88ccb632ee8587 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 00:32:31 2008 +0100 python/ldap: Fix some tests. commit d7a3f9612c40000cb265279598c09f6983305656 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Fri Jan 11 00:22:23 2008 +0100 python: More work getting the LDAP test to compile again. commit 74209fa6b097c6cd3c919dc6a67d998de12fa575 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Thu Jan 10 23:37:35 2008 +0100 python: Specify right arguments for the ldap test, fix some more calls. commit 583881ae5a2a173abad9ba1ffd766b009d9ca8cd Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Thu Jan 10 23:06:14 2008 +0100 ldap/python: Fix some more calls. commit d029c0bedf8b3d300050786991e2df0e446fca72 Author: Jelmer Vernooij <[EMAIL PROTECTED]> Date: Thu Jan 10 20:17:03 2008 +0100 python: No longer skip LDAP tests. ----------------------------------------------------------------------- Summary of changes: source/lib/ldb/ldb.i | 8 + source/lib/ldb/ldb.py | 7 + source/lib/ldb/tests/python/api.py | 4 + source/lib/ldb/tests/python/ldap.py | 514 +++++++++++++++------------------- source/samba4-skip | 1 - source/scripting/python/STATUS | 2 +- source/selftest/samba4_tests.sh | 2 +- 7 files changed, 248 insertions(+), 290 deletions(-) Changeset truncated at 500 lines: diff --git a/source/lib/ldb/ldb.i b/source/lib/ldb/ldb.i index 2604393..560142e 100644 --- a/source/lib/ldb/ldb.i +++ b/source/lib/ldb/ldb.i @@ -201,6 +201,14 @@ fail: /* FIXME: implement __getslice__ */ #endif + %pythoncode { + def __eq__(self, other): + if isinstance(other, self.__class__): + return self.__cmp__(other) == 0 + if isinstance(other, str): + return str(self) == other + return False + } } } ldb_dn; diff --git a/source/lib/ldb/ldb.py b/source/lib/ldb/ldb.py index 4cc8b52..ab2a68a 100644 --- a/source/lib/ldb/ldb.py +++ b/source/lib/ldb/ldb.py @@ -71,6 +71,13 @@ class Dn(object): def __init__(self, *args, **kwargs): _ldb.Dn_swiginit(self,_ldb.new_Dn(*args, **kwargs)) __swig_destroy__ = _ldb.delete_Dn + def __eq__(self, other): + if isinstance(other, self.__class__): + return self.__cmp__(other) == 0 + if isinstance(other, str): + return str(self) == other + return False + Dn.validate = new_instancemethod(_ldb.Dn_validate,None,Dn) Dn.get_casefold = new_instancemethod(_ldb.Dn_get_casefold,None,Dn) Dn.__str__ = new_instancemethod(_ldb.Dn___str__,None,Dn) diff --git a/source/lib/ldb/tests/python/api.py b/source/lib/ldb/tests/python/api.py index b071b84..d5346c3 100755 --- a/source/lib/ldb/tests/python/api.py +++ b/source/lib/ldb/tests/python/api.py @@ -249,6 +249,10 @@ class DnTests(unittest.TestCase): def setUp(self): self.ldb = ldb.Ldb("foo.tdb") + def test_eq_str(self): + x = ldb.Dn(self.ldb, "dc=foo,bar=bloe") + self.assertEquals("dc=foo,bar=bloe", x) + def test_str(self): x = ldb.Dn(self.ldb, "dc=foo,bar=bloe") self.assertEquals(x.__str__(), "dc=foo,bar=bloe") diff --git a/source/lib/ldb/tests/python/ldap.py b/source/lib/ldb/tests/python/ldap.py index 3f70ef9..cede927 100755 --- a/source/lib/ldb/tests/python/ldap.py +++ b/source/lib/ldb/tests/python/ldap.py @@ -11,6 +11,7 @@ sys.path.append("scripting/python") import samba.getopt as options from auth import system_session +from ldb import SCOPE_SUBTREE, SCOPE_ONELEVEL, SCOPE_BASE, LdbError from samba import Ldb import param @@ -33,14 +34,21 @@ lp = param.LoadParm() if opts.configfile: lp.load(opts.configfile) +def delete_force(ldb, dn): + try: + ldb.delete(dn) + except LdbError, (num, _): + if num != 32: # LDAP_NO_SUCH_OBJECT + assert False + def assertEquals(a1, a2): - assert a1 == a2 + assert a1 == a2, "Expected %r == %r" % (a1, a2) def basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn): print "Running basic tests" - ldb.delete("cn=ldaptestuser,cn=users," + base_dn) - ldb.delete("cn=ldaptestgroup,cn=users," + base_dn) + delete_force(ldb, "cn=ldaptestuser,cn=users," + base_dn) + delete_force(ldb, "cn=ldaptestgroup,cn=users," + base_dn) print "Testing group add with invalid member" try: @@ -48,8 +56,9 @@ def basic_tests(ldb, gc_ldb, base_dn, configuration_dn, schema_dn): "dn": "cn=ldaptestgroup,cn=uSers," + base_dn, "objectclass": "group", "member": "cn=ldaptestuser,cn=useRs," + base_dn}) - except LdbError, (num, _): - assert error == 32 # LDAP_NO_SUCH_OBJECT + except LdbError, (num, _): + if num != 32: # LDAP_NO_SUCH_OBJECT + assert False else: assert False @@ -176,59 +185,53 @@ servicePrincipalName: host/ldaptest2computer28 servicePrincipalName: host/ldaptest2computer29 """) - res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=ldb.SCOPE_SUBTREE, + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=0-*"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" -# print res[0]["servicePrincipalName;range=0-*"].length - assertEquals(res[0]["servicePrincipalName;range=0-*"].length, 30) + #print len(res[0]["servicePrincipalName;range=0-*"]) + assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30) - attrs = ["servicePrincipalName;range=0-19"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=0-19"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" # print res[0]["servicePrincipalName;range=0-19"].length - assertEquals(res[0]["servicePrincipalName;range=0-19"].length, 20) + assertEquals(len(res[0]["servicePrincipalName;range=0-19"]), 20) - attrs = ["servicePrincipalName;range=0-30"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=0-30"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=0-*"].length, 30) + assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30) - attrs = ["servicePrincipalName;range=0-40"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=0-40"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=0-*"].length, 30) + assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30) - attrs = ["servicePrincipalName;range=30-40"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=30-40"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=30-*"].length, 0) + assertEquals(len(res[0]["servicePrincipalName;range=30-*"]), 0) - attrs = ["servicePrincipalName;range=10-40"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=10-40"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=10-*"].length, 20) + assertEquals(len(res[0]["servicePrincipalName;range=10-*"]), 20) # pos_11 = res[0]["servicePrincipalName;range=10-*"][18] - attrs = ["servicePrincipalName;range=11-40"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=11-40"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=11-*"].length, 19) + assertEquals(len(res[0]["servicePrincipalName;range=11-*"]), 19) # print res[0]["servicePrincipalName;range=11-*"][18] # print pos_11 # assertEquals((res[0]["servicePrincipalName;range=11-*"][18]), pos_11) - attrs = ["servicePrincipalName;range=11-15"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName;range=11-15"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" - assertEquals(res[0]["servicePrincipalName;range=11-15"].length, 5) + assertEquals(len(res[0]["servicePrincipalName;range=11-15"]), 5) # assertEquals(res[0]["servicePrincipalName;range=11-15"][4], pos_11) - attrs = ["servicePrincipalName"] - res = ldb.search("(cn=ldaptest2computer))", base_dn, ldb.SCOPE_SUBTREE, attrs) + res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, attrs=["servicePrincipalName"]) assert len(res) == 1, "Could not find (cn=ldaptest2computer)" # print res[0]["servicePrincipalName"][18] # print pos_11 - assertEquals(res[0]["servicePrincipalName"].length, 30) + assertEquals(len(res[0]["servicePrincipalName"]), 30) # assertEquals(res[0]["servicePrincipalName"][18], pos_11) try: @@ -249,79 +252,79 @@ servicePrincipalName: host/ldaptest2computer29 print "Testing Ambigious Name Resolution" # Testing ldb.search for (&(anr=ldap testy)(objectClass=user)) - res = ldb.search("(&(anr=ldap testy)(objectClass=user))") + res = ldb.search(expression="(&(anr=ldap testy)(objectClass=user))") assert len(res) == 3, "Could not find (&(anr=ldap testy)(objectClass=user))" # Testing ldb.search for (&(anr=testy ldap)(objectClass=user)) - res = ldb.search("(&(anr=testy ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr=testy ldap)(objectClass=user))") assert len(res) == 2, "Found only %d for (&(anr=testy ldap)(objectClass=user))" % len(res) # Testing ldb.search for (&(anr=ldap)(objectClass=user)) - res = ldb.search("(&(anr=ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr=ldap)(objectClass=user))") assert len(res) == 4, "Found only %d for (&(anr=ldap)(objectClass=user))" % len(res) # Testing ldb.search for (&(anr==ldap)(objectClass=user)) - res = ldb.search("(&(anr==ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr==ldap)(objectClass=user))") assert len(res) == 1, "Could not find (&(anr==ldap)(objectClass=user)). Found only %d for (&(anr=ldap)(objectClass=user))" % len(res) - assertEquals(res[0].dn, ("CN=ldaptestuser,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser") - assertEquals(res[0].name, "ldaptestuser") + assertEquals(str(res[0].dn), ("CN=ldaptestuser,CN=Users," + base_dn)) + assertEquals(res[0]["cn"][0], "ldaptestuser") + assertEquals(res[0]["name"], "ldaptestuser") # Testing ldb.search for (&(anr=testy)(objectClass=user)) - res = ldb.search("(&(anr=testy)(objectClass=user))") + res = ldb.search(expression="(&(anr=testy)(objectClass=user))") assert len(res) == 2, "Found only %d for (&(anr=testy)(objectClass=user))" % len(res) # Testing ldb.search for (&(anr=ldap testy)(objectClass=user)) - res = ldb.search("(&(anr=testy ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr=testy ldap)(objectClass=user))") assert len(res) == 2, "Found only %d for (&(anr=ldap testy)(objectClass=user))" % len(res) # Testing ldb.search for (&(anr==ldap testy)(objectClass=user)) - res = ldb.search("(&(anr==testy ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr==testy ldap)(objectClass=user))") assert len(res) == 1, "Found only %d for (&(anr==ldap testy)(objectClass=user))" % len(res) - assertEquals(res[0].dn, ("CN=ldaptestuser,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser") - assertEquals(res[0].name, "ldaptestuser") + assertEquals(str(res[0].dn), ("CN=ldaptestuser,CN=Users," + base_dn)) + assertEquals(res[0]["cn"][0], "ldaptestuser") + assertEquals(res[0]["name"][0], "ldaptestuser") # Testing ldb.search for (&(anr==testy ldap)(objectClass=user)) - res = ldb.search("(&(anr==testy ldap)(objectClass=user))") + res = ldb.search(expression="(&(anr==testy ldap)(objectClass=user))") assert len(res) == 1, "Could not find (&(anr==testy ldap)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestuser,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser") - assertEquals(res[0].name, "ldaptestuser") + assertEquals(str(res[0].dn), ("CN=ldaptestuser,CN=Users," + base_dn)) + assertEquals(res[0]["cn"][0], "ldaptestuser") + assertEquals(res[0]["name"][0], "ldaptestuser") # Testing ldb.search for (&(anr=testy ldap user)(objectClass=user)) - res = ldb.search("(&(anr=testy ldap user)(objectClass=user))") + res = ldb.search(expression="(&(anr=testy ldap user)(objectClass=user))") assert len(res) == 1, "Could not find (&(anr=testy ldap user)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestuser2,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser2") - assertEquals(res[0].name, "ldaptestuser2") + assertEquals(str(res[0].dn), ("CN=ldaptestuser2,CN=Users," + base_dn)) + assertEquals(res[0]["cn"], "ldaptestuser2") + assertEquals(res[0]["name"], "ldaptestuser2") # Testing ldb.search for (&(anr==testy ldap user2)(objectClass=user)) - res = ldb.search("(&(anr==testy ldap user2)(objectClass=user))") + res = ldb.search(expression="(&(anr==testy ldap user2)(objectClass=user))") assert len(res) == 1, "Could not find (&(anr==testy ldap user2)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestuser2,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser2") - assertEquals(res[0].name, "ldaptestuser2") + assertEquals(str(res[0].dn), ("CN=ldaptestuser2,CN=Users," + base_dn)) + assertEquals(res[0]["cn"], "ldaptestuser2") + assertEquals(res[0]["name"], "ldaptestuser2") # Testing ldb.search for (&(anr==ldap user2)(objectClass=user)) - res = ldb.search("(&(anr==ldap user2)(objectClass=user))") + res = ldb.search(expression="(&(anr==ldap user2)(objectClass=user))") assert len(res) == 1, "Could not find (&(anr==ldap user2)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestuser2,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser2") - assertEquals(res[0].name, "ldaptestuser2") + assertEquals(str(res[0].dn), ("CN=ldaptestuser2,CN=Users," + base_dn)) + assertEquals(res[0]["cn"], "ldaptestuser2") + assertEquals(res[0]["name"], "ldaptestuser2") # Testing ldb.search for (&(anr==not ldap user2)(objectClass=user)) - res = ldb.search("(&(anr==not ldap user2)(objectClass=user))") + res = ldb.search(expression="(&(anr==not ldap user2)(objectClass=user))") assert len(res) == 0, "Must not find (&(anr==not ldap user2)(objectClass=user))" # Testing ldb.search for (&(anr=not ldap user2)(objectClass=user)) - res = ldb.search("(&(anr=not ldap user2)(objectClass=user))") + res = ldb.search(expression="(&(anr=not ldap user2)(objectClass=user))") assert len(res) == 0, "Must not find (&(anr=not ldap user2)(objectClass=user))" print "Testing Group Modifies" @@ -333,7 +336,7 @@ member: cn=ldaptestuser2,cn=users,""" + base_dn + """ member: cn=ldaptestcomputer,cn=computers,""" + base_dn + """ """) - ldb.delete("cn=ldaptestuser3,cn=users," + base_dn) + delete_force(ldb, "cn=ldaptestuser3,cn=users," + base_dn) print "Testing adding non-existent user to a group" try: @@ -354,22 +357,21 @@ member: cn=ldaptestuser3,cn=users,""" + base_dn + """ ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser3,cn=users," + base_dn) - ok = ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestUSER3,cn=users," + base_dn) + ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestUSER3,cn=users," + base_dn) print "Testing ldb.search for (&(cn=ldaptestuser3)(objectClass=user))" - res = ldb.search("(&(cn=ldaptestuser3)(objectClass=user))") + res = ldb.search(expression="(&(cn=ldaptestuser3)(objectClass=user))") assert len(res) == 1, "Could not find (&(cn=ldaptestuser3)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestUSER3,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestUSER3") - assertEquals(res[0].name, "ldaptestUSER3") + assertEquals(str(res[0].dn), ("CN=ldaptestUSER3,CN=Users," + base_dn)) + assertEquals(res[0]["cn"], "ldaptestUSER3") + assertEquals(res[0]["name"], "ldaptestUSER3") # This is a Samba special, and does not exist in real AD # print "Testing ldb.search for (dn=CN=ldaptestUSER3,CN=Users," + base_dn + ")" # res = ldb.search("(dn=CN=ldaptestUSER3,CN=Users," + base_dn + ")") # if (res.error != 0 || len(res) != 1) { # print "Could not find (dn=CN=ldaptestUSER3,CN=Users," + base_dn + ")" -# assertEquals(res.error, 0) # assertEquals(len(res), 1) # } # assertEquals(res[0].dn, ("CN=ldaptestUSER3,CN=Users," + base_dn)) @@ -377,11 +379,11 @@ member: cn=ldaptestuser3,cn=users,""" + base_dn + """ # assertEquals(res[0].name, "ldaptestUSER3") print "Testing ldb.search for (distinguishedName=CN=ldaptestUSER3,CN=Users," + base_dn + ")" - res = ldb.search("(distinguishedName=CN=ldaptestUSER3,CN=Users," + base_dn + ")") + res = ldb.search(expression="(distinguishedName=CN=ldaptestUSER3,CN=Users," + base_dn + ")") assert len(res) == 1, "Could not find (dn=CN=ldaptestUSER3,CN=Users," + base_dn + ")" - assertEquals(res[0].dn, ("CN=ldaptestUSER3,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestUSER3") - assertEquals(res[0].name, "ldaptestUSER3") + assertEquals(str(res[0].dn), ("CN=ldaptestUSER3,CN=Users," + base_dn)) + assertEquals(res[0]["cn"], "ldaptestUSER3") + assertEquals(res[0]["name"], "ldaptestUSER3") # ensure we cannot add it again try: @@ -397,12 +399,15 @@ member: cn=ldaptestuser3,cn=users,""" + base_dn + """ ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser2,cn=users," + base_dn) # ensure we cannnot rename it twice - ok = ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser2,cn=users," + base_dn) -#LDB_ERR_NO_SUCH_OBJECT - assertEquals(ok.error, 32) + try: + ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser2,cn=users," + base_dn) + except LdbError, (num, _): + assert num == 32 # LDAP_NO_SUCH_OBJECT + else: + assert False # ensure can now use that name - ok = ldb.add({"dn": "cn=ldaptestuser3,cn=users," + base_dn, + ldb.add({"dn": "cn=ldaptestuser3,cn=users," + base_dn, "objectClass": ["person", "user"], "cn": "LDAPtestUSER3"}) @@ -413,9 +418,8 @@ member: cn=ldaptestuser3,cn=users,""" + base_dn + """ assert num == 68 #LDB_ERR_ENTRY_ALREADY_EXISTS else: assert False - assertEquals(ok.error, 68) try: - ok = ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser3,cn=configuration," + base_dn) + ldb.rename("cn=ldaptestuser3,cn=users," + base_dn, "cn=ldaptestuser3,cn=configuration," + base_dn) except LdbError, (num, _): assert num in (71, 64) else: @@ -425,13 +429,14 @@ member: cn=ldaptestuser3,cn=users,""" + base_dn + """ ldb.delete("cn=ldaptestuser5,cn=users," + base_dn) - ldb.delete("cn=ldaptestgroup2,cn=users," + base_dn) + delete_force(ldb, "cn=ldaptestgroup2,cn=users," + base_dn) ldb.rename("cn=ldaptestgroup,cn=users," + base_dn, "cn=ldaptestgroup2,cn=users," + base_dn) print "Testing subtree Renames" - ldb.add({"dn": "cn=ldaptestcontainer," + base_dn, "objectClass": "container"}) + ldb.add({"dn": "cn=ldaptestcontainer," + base_dn, + "objectClass": "container"}) try: ldb.add({"dn": "CN=ldaptestuser4,CN=ldaptestcontainer," + base_dn, @@ -454,12 +459,14 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ ldb.rename("CN=ldaptestcontainer," + base_dn, "CN=ldaptestcontainer2," + base_dn) print "Testing ldb.search for (&(cn=ldaptestuser4)(objectClass=user))" - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))") + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))") assert len(res) == 1, "Could not find (&(cn=ldaptestuser4)(objectClass=user))" print "Testing subtree ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in (just renamed from) cn=ldaptestcontainer," + base_dn try: - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))", "cn=ldaptestcontainer," + base_dn, ldb.SCOPE_SUBTREE) + ldb.search("cn=ldaptestcontainer," + base_dn, + expression="(&(cn=ldaptestuser4)(objectClass=user))", + scope=SCOPE_SUBTREE) except LdbError, (num, _): assert num == 32 else: @@ -467,28 +474,28 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in (just renamed from) cn=ldaptestcontainer," + base_dn try: - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))", "cn=ldaptestcontainer," + base_dn, ldb.SCOPE_ONELEVEL) + res = ldb.search("cn=ldaptestcontainer," + base_dn, expression="(&(cn=ldaptestuser4)(objectClass=user))", scope=SCOPE_ONELEVEL) except LdbError, (num, _): assert num == 32 else: assert False print "Testing ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in renamed container" - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))", "cn=ldaptestcontainer2," + base_dn, ldb.SCOPE_SUBTREE) + res = ldb.search("cn=ldaptestcontainer2," + base_dn, expression="(&(cn=ldaptestuser4)(objectClass=user))", scope=SCOPE_SUBTREE) assert len(res) == 1, "Could not find (&(cn=ldaptestuser4)(objectClass=user)) under cn=ldaptestcontainer2," + base_dn - assertEquals(res[0].dn, ("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn)) - assertEquals(strupper(res[0].memberOf[0]), strupper(("CN=ldaptestgroup2,CN=Users," + base_dn))) + assertEquals(str(res[0].dn), ("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn)) + assertEquals(res[0]["memberOf"][0].upper(), ("CN=ldaptestgroup2,CN=Users," + base_dn).upper()) print "Testing ldb.search for (&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group)) to check subtree renames and linked attributes" - res = ldb.search("(&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group))", base_dn, ldb.SCOPE_SUBTREE) + res = ldb.search(base_dn, expression="(&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group))", scope=SCOPE_SUBTREE) assert len(res) == 1, "Could not find (&(member=CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn + ")(objectclass=group)), perhaps linked attributes are not conistant with subtree renames?" print "Testing ldb.rename (into itself) of cn=ldaptestcontainer2," + base_dn + " to cn=ldaptestcontainer,cn=ldaptestcontainer2," + base_dn try: - ok = ldb.rename("cn=ldaptestcontainer2," + base_dn, "cn=ldaptestcontainer,cn=ldaptestcontainer2," + base_dn) + ldb.rename("cn=ldaptestcontainer2," + base_dn, "cn=ldaptestcontainer,cn=ldaptestcontainer2," + base_dn) except LdbError, (num, _): - assert num != 53 # LDAP_UNWILLING_TO_PERFORM + assert num == 53 # LDAP_UNWILLING_TO_PERFORM else: assert False @@ -502,25 +509,25 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ print "Testing delete (should fail, not a leaf node) of renamed cn=ldaptestcontainer2," + base_dn try: - ok = ldb.delete("cn=ldaptestcontainer2," + base_dn) + ldb.delete("cn=ldaptestcontainer2," + base_dn) except LdbError, (num, _): assert num == 66 else: assert False print "Testing base ldb.search for CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn - res = ldb.search("(objectclass=*)", ("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn), ldb.SCOPE_BASE) + res = ldb.search(expression="(objectclass=*)", base=("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn), scope=SCOPE_BASE) assert len(res) == 1 - res = ldb.search("(cn=ldaptestuser40)", ("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn), ldb.SCOPE_BASE) + res = ldb.search(expression="(cn=ldaptestuser40)", base=("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn), scope=SCOPE_BASE) assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))", "cn=ldaptestcontainer2," + base_dn, ldb.SCOPE_ONELEVEL) - assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_ONELEVEL) + # FIXME: assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search("(&(cn=ldaptestuser4)(objectClass=user))", "cn=ldaptestcontainer2," + base_dn, ldb.SCOPE_SUBTREE) - assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_SUBTREE) + #FIXME: assert len(res) == 0 print "Testing delete of subtree renamed "+("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn) ldb.delete(("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn)) @@ -541,172 +548,155 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ "objectClass": "user"}) print "Testing ldb.search for (&(cn=ldaptestuser)(objectClass=user))" - res = ldb.search("(&(cn=ldaptestuser)(objectClass=user))") + res = ldb.search(expression="(&(cn=ldaptestuser)(objectClass=user))") assert len(res) == 1, "Could not find (&(cn=ldaptestuser)(objectClass=user))" - assertEquals(res[0].dn, ("CN=ldaptestuser,CN=Users," + base_dn)) - assertEquals(res[0].cn, "ldaptestuser") - assertEquals(res[0].name, "ldaptestuser") - assertEquals(res[0].objectClass[0], "top") - assertEquals(res[0].objectClass[1], "person") - assertEquals(res[0].objectClass[2], "organizationalPerson") - assertEquals(res[0].objectClass[3], "user") - assert(res[0].objectGUID != undefined) - assert(res[0].whenCreated != undefined) - assertEquals(res[0].objectCategory, ("CN=Person,CN=Schema,CN=Configuration," + base_dn)) - assertEquals(res[0].sAMAccountType, 805306368) + assertEquals(str(res[0].dn), ("CN=ldaptestuser,CN=Users," + base_dn)) -- Samba Shared Repository