From 62905cd6d21d457a54faa2a14e9713dcf280dbe5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 23 Jan 2015 14:28:28 +1300 Subject: torture-krb5: Split the expected behaviour of the RODC up The expectations of the cached accounts are different to those of the RODC in general. Pair-programmed-with: Garming Sam Signed-off-by: Garming Sam Signed-off-by: Andrew Bartlett --- source4/selftest/tests.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'source4/selftest') diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py index 62d5473b45..ec202b4881 100755 --- a/source4/selftest/tests.py +++ b/source4/selftest/tests.py @@ -549,12 +549,19 @@ for env in ["dc", "s4member", "rodc", "promoted_dc", "plugin_s4_dc", "s3member"] plantestsuite("samba.blackbox.wbinfo(%s:local)" % env, "%s:local" % env, [os.path.join(samba4srcdir, "../nsswitch/tests/test_wbinfo.sh"), '$DOMAIN', '$DC_USERNAME', '$DC_PASSWORD', env]) for env in ["dc", "rodc", "promoted_dc", "plugin_s4_dc", "fl2000dc", "fl2003dc", "fl2008r2dc"]: - plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'], + if env == "rodc": + extra_options = ['--option=torture:expect_rodc=true'] + else: + extra_options = [] + + plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-U$USERNAME%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'] + extra_options, "samba4.krb5.kdc with specified account") - plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestdenied%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'], + plansmbtorture4testsuite('krb5.kdc', env, ['ncacn_np:$SERVER_IP', "-k", "yes", '-Utestdenied%$PASSWORD', '--workgroup=$DOMAIN', '--realm=$REALM'] + extra_options, "samba4.krb5.kdc with account DENIED permission to replicate to an RODC") + + # These last two tests are for users cached at the RODC if env == "rodc": - extra_options = ['--option=torture:expect_rodc=true'] + extra_options = ['--option=torture:expect_rodc=true', '--option=torture:expect_cached_at_rodc=true'] else: extra_options = [] -- cgit