summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-11 10:01:26 +0100
committerMatthias Dieter Wallnöfer <mdw@samba.org>2010-11-11 10:03:38 +0100
commit79548f0da243884d60845f61fe2404e26eb52f65 (patch)
treea8a7ea8c69b2644982021d3e6248b6c9b1bb4ebb
parent5ded90ef66744e8919868362ac455bdbf4b1568b (diff)
downloadsamba-79548f0da243884d60845f61fe2404e26eb52f65.tar.gz
samba-79548f0da243884d60845f61fe2404e26eb52f65.tar.bz2
samba-79548f0da243884d60845f61fe2404e26eb52f65.zip
s4:selftest/tests.py - skip the "passwords.py" suite on Windows 2000 domain function level
The "userPassword" password change functionality isn't available and so it causes big parts of the testsuite to fail. On the other hand we've basic tests in "acl.py" and indirectly also over SAMR and kpasswd so I propose to simply skip it.
-rwxr-xr-xsource4/selftest/tests.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 68e02ad0c4..a08e93137a 100755
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -485,7 +485,11 @@ for env in ["dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]:
plantestsuite("samba4.ldap.possibleInferiors.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/samdb/ldb_modules/tests/possibleinferiors.py"), "ldap://$SERVER", '-U"$USERNAME%$PASSWORD"', "-W", "$DOMAIN"])
plantestsuite("samba4.ldap.secdesc.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/sec_descriptor.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
plantestsuite("samba4.ldap.acl.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/acl.py"), '$SERVER', '-U"$USERNAME%$PASSWORD"', '-W', '$DOMAIN'])
- plantestsuite("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W", "$DOMAIN"])
+ if env != "fl2000dc":
+ # This test makes excessively use of the "userPassword" attribute which
+ # isn't available on DCs with Windows 2000 domain function level -
+ # therefore skip it in that configuration
+ plantestsuite("samba4.ldap.passwords.python(%s)" % env, env, [python, os.path.join(samba4srcdir, "dsdb/tests/python/passwords.py"), "$SERVER", '-U"$USERNAME%$PASSWORD"', "-W", "$DOMAIN"])
planpythontestsuite("dc:local", "samba.tests.upgradeprovisionneeddc")
planpythontestsuite("none", "samba.tests.upgradeprovision")
planpythontestsuite("none", "samba.tests.xattr")