From 79548f0da243884d60845f61fe2404e26eb52f65 Mon Sep 17 00:00:00 2001 From: Matthias Dieter Wallnöfer Date: Thu, 11 Nov 2010 10:01:26 +0100 Subject: 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. --- source4/selftest/tests.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source4/selftest') 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") -- cgit