python/ldap: Get further.

diff --git a/source/lib/ldb/tests/python/ldap.py b/source/lib/ldb/tests/python/ldap.py
index 7e3082fa0949f4203d6c2d7954175cd12edc9e6a..3d69ff63b40126b8e236ccff24cad846a2f8642a 100755 (executable)
--- a/source/lib/ldb/tests/python/ldap.py
+++ b/source/lib/ldb/tests/python/ldap.py
@@ -187,7 +187,7 @@ servicePrincipalName: host/ldaptest2computer29
         res = ldb.search(base_dn, expression="(cn=ldaptest2computer))", scope=SCOPE_SUBTREE, 
                          attrs=["servicePrincipalName;range=0-*"])
         assert len(res) == 1, "Could not find (cn=ldaptest2computer)"
         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
+        #print len(res[0]["servicePrincipalName;range=0-*"])

         assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30)
 
         attrs = ["servicePrincipalName;range=0-19"]
         assertEquals(len(res[0]["servicePrincipalName;range=0-*"]), 30)
 
         attrs = ["servicePrincipalName;range=0-19"]


@@ -886,7 +886,6 @@ def basedn_tests(ldb, gc_ldb):
     assertEquals(len(res), 1)
 
     print "Testing for highestCommittedUSN"
     assertEquals(len(res), 1)
 
     print "Testing for highestCommittedUSN"

-    

     res = ldb.search(scope=SCOPE_BASE, attrs=["highestCommittedUSN"])
     assertEquals(len(res), 1)
     assert(res[0]["highestCommittedUSN"] != 0)
     res = ldb.search(scope=SCOPE_BASE, attrs=["highestCommittedUSN"])
     assertEquals(len(res), 1)
     assert(res[0]["highestCommittedUSN"] != 0)


@@ -900,17 +899,20 @@ def basedn_tests(ldb, gc_ldb):
             attrs=["netlogon", "highestCommittedUSN"])
     assertEquals(len(res), 0)
 
             attrs=["netlogon", "highestCommittedUSN"])
     assertEquals(len(res), 0)
 

+

 def find_basedn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, 
                      attrs=["defaultNamingContext"])
     assertEquals(len(res), 1)
     return res[0]["defaultNamingContext"][0]
 
 def find_basedn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, 
                      attrs=["defaultNamingContext"])
     assertEquals(len(res), 1)
     return res[0]["defaultNamingContext"][0]
 

+

 def find_configurationdn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["configurationNamingContext"])
     assertEquals(len(res), 1)
     return res[0]["configurationNamingContext"][0]
 
 def find_configurationdn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["configurationNamingContext"])
     assertEquals(len(res), 1)
     return res[0]["configurationNamingContext"][0]
 

+

 def find_schemadn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["schemaNamingContext"])
     assertEquals(len(res), 1)
 def find_schemadn(ldb):
     res = ldb.search(base="", expression="", scope=SCOPE_BASE, attrs=["schemaNamingContext"])
     assertEquals(len(res), 1)

diff --git a/source/selftest/samba4_tests.sh b/source/selftest/samba4_tests.sh
index 4856265f7390f1715385d8bcfa68bbeca48d1575..11daa4bd59fb7116504adcfaf06cbcf4843428d6 100755 (executable)
--- a/source/selftest/samba4_tests.sh
+++ b/source/selftest/samba4_tests.sh
@@ -322,7 +322,7 @@ then
        plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
        plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
        plantest "samba3sam.python" none PYTHONPATH="$PYTHONPATH:dsdb/samdb/ldb_modules/tests" $SUBUNITRUN samba3sam
        plantest "samba3.python" none $SUBUNITRUN samba.tests.samba3
        plantest "events.python" none PYTHONPATH="$PYTHONPATH:lib/events" $SUBUNITRUN tests
        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 $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD
+       plantest "ldap.python" dc $PYTHON $samba4srcdir/lib/ldb/tests/python/ldap.py $CONFIGURATION \$SERVER -U\$USERNAME%\$PASSWORD -W \$DOMAIN

        plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
        rm -rf $PREFIX/upgrade
        plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf
        plantest "blackbox.samba3dump" none $PYTHON scripting/bin/samba3dump $samba4srcdir/../testdata/samba3
        rm -rf $PREFIX/upgrade
        plantest "blackbox.upgrade" none $PYTHON setup/upgrade.py $CONFIGURATION --targetdir=$PREFIX/upgrade ../testdata/samba3 ../testdata/samba3/smb.conf