From 59ff1102942b564faa257c9f283efeb6fea63b8f Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Fri, 11 Jan 2013 13:15:43 -0500 Subject: Test multi-value host referral variables host_based_services and no_host_referral are allowed to have multiple relations in each place they appear, so alter a couple of the test cases to exercise that. --- src/tests/t_referral.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/tests') diff --git a/src/tests/t_referral.py b/src/tests/t_referral.py index ff8527b7f..884e45bf8 100644 --- a/src/tests/t_referral.py +++ b/src/tests/t_referral.py @@ -34,14 +34,14 @@ test(realm, 'unknown', False, 'unknown, no variables') # With host_based_services matching the first server name component # ("a"), we should get a referral for an NT-UNKNOWN server name. # host_based_services can appear in either [kdcdefaults] or the realm -# section, with the realm value supplementing the kdcdefaults value. +# section, with the realm values supplementing the kdcdefaults values. # NT-SRV-HST server names should be unaffected by host_based_services, # and NT-PRINCIPAL server names shouldn't get a referral regardless. restart_kdc(realm, {'kdcdefaults': {'host_based_services': '*'}}) test(realm, 'unknown', True, 'unknown, kdcdefaults hostbased *') test(realm, 'principal', False, 'principal, kdcdefaults hostbased *') -restart_kdc(realm, {'kdcdefaults': {'host_based_services': 'b,a,c'}}) -test(realm, 'unknown', True, 'unknown, kdcdefaults hostbased b,a,c') +restart_kdc(realm, {'kdcdefaults': {'host_based_services': ['b', 'a,c']}}) +test(realm, 'unknown', True, 'unknown, kdcdefaults hostbased b and a,c') restart_kdc(realm, {'realms': {'$realm': {'host_based_services': 'a b c'}}}) test(realm, 'unknown', True, 'unknown, realm hostbased a b c') restart_kdc(realm, {'kdcdefaults': {'host_based_services': 'a'}, @@ -58,8 +58,8 @@ test(realm, 'srv-hst', True, 'srv-hst, kdcdefaults hostbased b,c') # should not get a referral even for NT-SRV-HOST server names restart_kdc(realm, {'kdcdefaults': {'no_host_referral': '*'}}) test(realm, 'srv-hst', False, 'srv-hst, kdcdefaults nohost *') -restart_kdc(realm, {'kdcdefaults': {'no_host_referral': 'b,a,c'}}) -test(realm, 'srv-hst', False, 'srv-hst, kdcdefaults nohost b,a,c') +restart_kdc(realm, {'kdcdefaults': {'no_host_referral': ['b', 'a,c']}}) +test(realm, 'srv-hst', False, 'srv-hst, kdcdefaults nohost b and a,c') restart_kdc(realm, {'realms': {'$realm': {'no_host_referral': 'a b c'}}}) test(realm, 'srv-hst', False, 'srv-hst, realm nohost a b c') restart_kdc(realm, {'kdcdefaults': {'no_host_referral': 'a'}, -- cgit