sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-28 07:21:54 +03:00
Code

python: Specify right arguments for the ldap test, fix some more calls.

Browse Source 
(This used to be commit 74209fa6b0)
This commit is contained in:
Jelmer Vernooij 2008-01-10 23:37:35 +01:00
parent a785df0c0a
commit 410e8f8681
2 changed files with 31 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source4/lib/ldb/tests/python/ldap.py
View File

@ -551,8 +551,8 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """
assertEquals(res[0].objectClass[1], "person") assertEquals(res[0].objectClass[1], "person")
assertEquals(res[0].objectClass[2], "organizationalPerson") assertEquals(res[0].objectClass[2], "organizationalPerson")
assertEquals(res[0].objectClass[3], "user") assertEquals(res[0].objectClass[3], "user")
assert(res[0].objectGUID != undefined) assert("objectGUID" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
assertEquals(res[0].objectCategory, ("CN=Person,CN=Schema,CN=Configuration," + base_dn)) assertEquals(res[0].objectCategory, ("CN=Person,CN=Schema,CN=Configuration," + base_dn))
assertEquals(res[0].sAMAccountType, 805306368) assertEquals(res[0].sAMAccountType, 805306368)
# assertEquals(res[0].userAccountControl, 546) # assertEquals(res[0].userAccountControl, 546)
@ -600,8 +600,8 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """
assertEquals(res[0].objectClass[2], "organizationalPerson") assertEquals(res[0].objectClass[2], "organizationalPerson")
assertEquals(res[0].objectClass[3], "user") assertEquals(res[0].objectClass[3], "user")
assertEquals(res[0].objectClass[4], "computer") assertEquals(res[0].objectClass[4], "computer")
assert(res[0].objectGUID != undefined) assert("objectGUID" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
assertEquals(res[0].objectCategory, ("CN=Computer,CN=Schema,CN=Configuration," + base_dn)) assertEquals(res[0].objectCategory, ("CN=Computer,CN=Schema,CN=Configuration," + base_dn))
assertEquals(res[0].primaryGroupID, 513) assertEquals(res[0].primaryGroupID, 513)
# assertEquals(res[0].sAMAccountType, 805306368) # assertEquals(res[0].sAMAccountType, 805306368)
@ -667,17 +667,17 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """
assertEquals(res[0].objectClass[2], "organizationalPerson") assertEquals(res[0].objectClass[2], "organizationalPerson")
assertEquals(res[0].objectClass[3], "user") assertEquals(res[0].objectClass[3], "user")
assertEquals(res[0].objectClass[4], "computer") assertEquals(res[0].objectClass[4], "computer")
assert(res[0].objectGUID != undefined) assert("objectGUID" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
assertEquals(res[0].objectCategory, "cn=Computer,cn=Schema,cn=Configuration," + base_dn) assertEquals(res[0]["objectCategory"], "cn=Computer,cn=Schema,cn=Configuration," + base_dn)
assertEquals(res[0].sAMAccountType, 805306369) assertEquals(int(res[0]["sAMAccountType"]), 805306369)
# assertEquals(res[0].userAccountControl, 4098) # assertEquals(res[0].userAccountControl, 4098)
ldb.delete(res[0].dn) ldb.delete(res[0].dn)
attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "memberOf"] attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "memberOf"]
print "Testing ldb.search for (&(cn=ldaptestUSer2)(objectClass=user))" print "Testing ldb.search for (&(cn=ldaptestUSer2)(objectClass=user))"
res = ldb.search(base_dn, "(&(cn=ldaptestUSer2)(objectClass=user))", ldb.SCOPE_SUBTREE, attrs) res = ldb.search(base_dn, "(&(cn=ldaptestUSer2)(objectClass=user))", scope=SCOPE_SUBTREE, attrs=attrs)
assert len(res) == 1, "Could not find (&(cn=ldaptestUSer2)(objectClass=user))" assert len(res) == 1, "Could not find (&(cn=ldaptestUSer2)(objectClass=user))"
assertEquals(res[0].dn, ("CN=ldaptestuser2,CN=Users," + base_dn)) assertEquals(res[0].dn, ("CN=ldaptestuser2,CN=Users," + base_dn))
@ -687,14 +687,14 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """
assertEquals(res[0].objectClass[1], "person") assertEquals(res[0].objectClass[1], "person")
assertEquals(res[0].objectClass[2], "organizationalPerson") assertEquals(res[0].objectClass[2], "organizationalPerson")
assertEquals(res[0].objectClass[3], "user") assertEquals(res[0].objectClass[3], "user")
assert(res[0].objectGUID != undefined) assert("objectGUID" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
assert(res[0].nTSecurityDescriptor != undefined) assert("nTSecurityDescriptor" not in res[0])
assertEquals(res[0].memberOf[0], ("CN=ldaptestgroup2,CN=Users," + base_dn)) assertEquals(res[0].memberOf[0], ("CN=ldaptestgroup2,CN=Users," + base_dn))
attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "member"] attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "member"]
print "Testing ldb.search for (&(cn=ldaptestgroup2)(objectClass=group))" print "Testing ldb.search for (&(cn=ldaptestgroup2)(objectClass=group))"
res = ldb.search("(&(cn=ldaptestgroup2)(objectClass=group))", base_dn, ldb.SCOPE_SUBTREE, attrs) res = ldb.search(base_dn, "(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE, attrs=attrs)
assert len(res) == 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group))" assert len(res) == 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group))"
assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," + base_dn)) assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," + base_dn))
@ -702,11 +702,11 @@ member: cn=ldaptestuser4,cn=ldaptestcontainer,""" + base_dn + """
assertEquals(res[0].name, "ldaptestgroup2") assertEquals(res[0].name, "ldaptestgroup2")
assertEquals(res[0].objectClass[0], "top") assertEquals(res[0].objectClass[0], "top")
assertEquals(res[0].objectClass[1], "group") assertEquals(res[0].objectClass[1], "group")
assert(res[0].objectGUID != undefined) assert("objectGuid" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
assert(res[0].nTSecurityDescriptor != undefined) assert("nTSecurityDescriptor" not in res[0])
assertEquals(res[0].member[0], ("CN=ldaptestuser2,CN=Users," + base_dn)) assertEquals(res[0].member[0], ("CN=ldaptestuser2,CN=Users," + base_dn))
assertEquals(res[0].member.length, 1) assertEquals(len(res[0].member), 1)
ldb.modify_ldif(""" ldb.modify_ldif("""
dn: cn=ldaptestgroup2,cn=users,""" + base_dn + """ dn: cn=ldaptestgroup2,cn=users,""" + base_dn + """
@ -752,7 +752,7 @@ delete: member
member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """ member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """
""") """)
res = ldb.search("(&(cn=ldaptestgroup2)(objectClass=group))", base_dn, ldb.SCOPE_SUBTREE, attrs) res = ldb.search(base_dn, "(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE, attrs=attrs)
assert len(res) != 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group))" assert len(res) != 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group))"
assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," + base_dn)) assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," + base_dn))
@ -763,11 +763,11 @@ member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """
attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "member"] attrs = ["cn", "name", "objectClass", "objectGUID", "whenCreated", "nTSecurityDescriptor", "member"]
print "Testing ldb.search for (&(cn=ldaptestgroup2)(objectClass=group)) to check linked delete" print "Testing ldb.search for (&(cn=ldaptestgroup2)(objectClass=group)) to check linked delete"
res = ldb.search("(&(cn=ldaptestgroup2)(objectClass=group))", base_dn, ldb.SCOPE_SUBTREE, attrs) res = ldb.search(base_dn, "(&(cn=ldaptestgroup2)(objectClass=group))", scope=SCOPE_SUBTREE, attrs=attrs)
assert len(res) != 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group)) to check linked delete" assert len(res) != 1, "Could not find (&(cn=ldaptestgroup2)(objectClass=group)) to check linked delete"
assertEquals(res[0].dn, ("CN=ldaptestgroup2,CN=Users," + base_dn)) assertEquals(res[0]["dn"], ("CN=ldaptestgroup2,CN=Users," + base_dn))
assertEquals(res[0].member, undefined) assert("member" not in res[0])
print "Testing ldb.search for (&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))" print "Testing ldb.search for (&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))"
res = ldb.search("(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))") res = ldb.search("(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))")
@ -780,8 +780,8 @@ member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """
assertEquals(res[0].objectClass[1], "person") assertEquals(res[0].objectClass[1], "person")
assertEquals(res[0].objectClass[2], "organizationalPerson") assertEquals(res[0].objectClass[2], "organizationalPerson")
assertEquals(res[0].objectClass[3], "user") assertEquals(res[0].objectClass[3], "user")
assert(res[0].objectGUID != undefined) assert("objectGUID" not in res[0])
assert(res[0].whenCreated != undefined) assert("whenCreated" not in res[0])
ldb.delete(res[0].dn) ldb.delete(res[0].dn)
@ -794,20 +794,17 @@ member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """
ldb.delete(("CN=ldaptestgroup2,CN=Users," + base_dn)) ldb.delete(("CN=ldaptestgroup2,CN=Users," + base_dn))
print "Testing ldb.search for (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))" print "Testing ldb.search for (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))"
res = ldb.search("(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))") res = ldb.search(expression="(&(cn=ldaptestutf8user ÈÙÉÌÒÀ)(objectClass=user))")
assert len(res) == 1, "Could not find (expect space collapse, win2k3 fails) (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))" assert len(res) == 1, "Could not find (expect space collapse, win2k3 fails) (&(cn=ldaptestutf8user2 ÈÙÉÌÒÀ)(objectClass=user))"
print "Testing that we can't get at the configuration DN from the main search base" print "Testing that we can't get at the configuration DN from the main search base"
attrs = ["cn"] res = ldb.search(base_dn, "objectClass=crossRef", scope=SCOPE_SUBTREE, attrs=["cn"])
res = ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs)
assert len(res) == 0, "Got configuration DN " + res[0].dn + " which should not be able to be seen from main search base" assert len(res) == 0, "Got configuration DN " + res[0].dn + " which should not be able to be seen from main search base"
assertEquals(len(res), 0) assertEquals(len(res), 0)
print "Testing that we can get at the configuration DN from the main search base on the LDAP port with the 'phantom root' search_options control" print "Testing that we can get at the configuration DN from the main search base on the LDAP port with the 'phantom root' search_options control"
attrs = ["cn"] res = ldb.search(base_dn, "objectClass=crossRef", scope=SCOPE_SUBTREE, attrs=["cn"], controls=["search_options:1:2"])
controls = ["search_options:1:2"]
res = ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs, controls)
assert(len(res) > 0) assert(len(res) > 0)
if gc_ldb is not None: if gc_ldb is not None:
@ -818,18 +815,15 @@ member: CN=ldaptestutf8user èùéìòà,CN=Users,""" + base_dn + """
assert(len(res) > 0) assert(len(res) > 0)
print "Testing that we do find configuration elements in the global catlog" print "Testing that we do find configuration elements in the global catlog"
attrs = ["cn"] res = gc_ldb.search(base_dn, "objectClass=crossRef", scope=SCOPE_SUBTREE, attrs=["cn"])
res = gc_ldb.search("objectClass=crossRef", base_dn, ldb.SCOPE_SUBTREE, attrs)
assert (len(res) > 0) assert (len(res) > 0)
print "Testing that we do find configuration elements and user elements at the same time" print "Testing that we do find configuration elements and user elements at the same time"
attrs = ["cn"] res = gc_ldb.search(base_dn, "(|(objectClass=crossRef)(objectClass=person))", scope=SCOPE_SUBTREE, attrs=["cn"])
res = gc_ldb.search("(|(objectClass=crossRef)(objectClass=person))", base_dn, ldb.SCOPE_SUBTREE, attrs)
assert (len(res) > 0) assert (len(res) > 0)
print "Testing that we do find configuration elements in the global catlog, with the configuration basedn" print "Testing that we do find configuration elements in the global catlog, with the configuration basedn"
attrs = ["cn"] res = gc_ldb.search(configuration_dn, "objectClass=crossRef", scope=SCOPE_SUBTREE, attrs=["cn"])
res = gc_ldb.search("objectClass=crossRef", configuration_dn, ldb.SCOPE_SUBTREE, attrs)
assert (len(res) > 0) assert (len(res) > 0)
print "Testing that we can get at the configuration DN on the main LDAP port" print "Testing that we can get at the configuration DN on the main LDAP port"
@ -901,8 +895,7 @@ def basedn_tests(ldb, gc_ldb):
res = ldb.search(scope=SCOPE_BASE, attrs=["highestCommittedUSN"]) res = ldb.search(scope=SCOPE_BASE, attrs=["highestCommittedUSN"])
assertEquals(len(res), 1) assertEquals(len(res), 1)
assert(res[0].highestCommittedUSN != undefined) assert(res[0]["highestCommittedUSN"] != 0)
assert(res[0].highestCommittedUSN != 0)
print "Testing for netlogon via LDAP" print "Testing for netlogon via LDAP"
res = ldb.search(scope=SCOPE_BASE, attrs=["netlogon"]) res = ldb.search(scope=SCOPE_BASE, attrs=["netlogon"])

2
source4/selftest/samba4_tests.sh
View File

@ -322,7 +322,7 @@ then
plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3 plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py \$SERVER -U\$USERNAME%\$PASSWORD plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION -d 10 \$SERVER -U\$USERNAME%\$PASSWORD
plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3 plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
rm -rf $PREFIX/upgrade rm -rf $PREFIX/upgrade
plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf