diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-08 14:02:22 +0100 |
| commit | f47093baf0a91c717297ebcbd1d3416d788ba6aa (patch) | |
| tree | e1033c9b06c5067c8bbae54ab26c49050db0886e /source4/lib/ldb/tests/python | |
| parent | fffe4f3bdd27b11dce75c9b2c931f5291f04ab6b (diff) | |
| parent | 0efa783849ff4bd449cdcc5f643f0101d48746bb (diff) | |
| download | samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.gz samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.tar.bz2 samba-f47093baf0a91c717297ebcbd1d3416d788ba6aa.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/scripting/python/samba/provision.py
(This used to be commit e367df5d994181f08ad1a20a0ce01991ca30bcc8)
Diffstat (limited to 'source4/lib/ldb/tests/python')
| -rwxr-xr-x | source4/lib/ldb/tests/python/ldap.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source4/lib/ldb/tests/python/ldap.py b/source4/lib/ldb/tests/python/ldap.py index d35f7767df..a425ddc830 100755 --- a/source4/lib/ldb/tests/python/ldap.py +++ b/source4/lib/ldb/tests/python/ldap.py @@ -523,12 +523,12 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """ assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_ONELEVEL) - # FIXME: assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base=("cn=ldaptestcontainer2," + base_dn), scope=SCOPE_ONELEVEL) + assert len(res) == 0 print "Testing one-level ldb.search for (&(cn=ldaptestuser4)(objectClass=user)) in cn=ldaptestcontainer2," + base_dn - res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base="cn=ldaptestcontainer2," + base_dn, scope=SCOPE_SUBTREE) - #FIXME: assert len(res) == 0 + res = ldb.search(expression="(&(cn=ldaptestuser4)(objectClass=user))", base=("cn=ldaptestcontainer2," + base_dn), scope=SCOPE_SUBTREE) + assert len(res) == 0 print "Testing delete of subtree renamed "+("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn) ldb.delete(("CN=ldaptestuser4,CN=ldaptestcontainer2," + base_dn)) |