diff options
| author | Tom Yu <tlyu@mit.edu> | 2012-07-11 23:35:44 -0400 |
|---|---|---|
| committer | Tom Yu <tlyu@mit.edu> | 2012-07-11 23:39:36 -0400 |
| commit | 244bb3fde58dd6bab0969e0501b537c5871088f0 (patch) | |
| tree | 95cbc165d2c26e14eb5ffbeba49b6473c711ba18 /src/tests/dejagnu | |
| parent | 116e2b2980e2f15f78425f12aeb218c2c96b3e1d (diff) | |
| download | krb5-244bb3fde58dd6bab0969e0501b537c5871088f0.tar.gz krb5-244bb3fde58dd6bab0969e0501b537c5871088f0.tar.xz krb5-244bb3fde58dd6bab0969e0501b537c5871088f0.zip | |
Always recreate acl files during dejagnu tests
The dejagnu tests create some persistent acl files containing
hostname-derived principal names. These can get out of date if the
host has changed names since the last time the dejagnu tests were run,
causing failures (notably in iprop.exp). To avoid this problem,
change the dejagnu tests to always create new acl files for each test
run.
ticket: 7200 (new)
tags: pullup
target_version: 1.10.3
Diffstat (limited to 'src/tests/dejagnu')
| -rw-r--r-- | src/tests/dejagnu/config/default.exp | 10 | ||||
| -rw-r--r-- | src/tests/dejagnu/krb-standalone/iprop.exp | 8 |
2 files changed, 7 insertions, 11 deletions
diff --git a/src/tests/dejagnu/config/default.exp b/src/tests/dejagnu/config/default.exp index c906bf1090..2804b5c7f9 100644 --- a/src/tests/dejagnu/config/default.exp +++ b/src/tests/dejagnu/config/default.exp @@ -875,12 +875,10 @@ proc setup_kerberos_files { } { } # Create ACL file. - if ![file exists $tmppwd/acl] { - set aclfile [open $tmppwd/acl w] - puts $aclfile "krbtest/admin@$REALMNAME *" - puts $aclfile "kiprop/$hostname@$REALMNAME p" - close $aclfile - } + set aclfile [open $tmppwd/acl w] + puts $aclfile "krbtest/admin@$REALMNAME *" + puts $aclfile "kiprop/$hostname@$REALMNAME p" + close $aclfile # Create dictfile file. if ![file exists $tmppwd/dictfile] { diff --git a/src/tests/dejagnu/krb-standalone/iprop.exp b/src/tests/dejagnu/krb-standalone/iprop.exp index aff4dc2a87..0170bb621d 100644 --- a/src/tests/dejagnu/krb-standalone/iprop.exp +++ b/src/tests/dejagnu/krb-standalone/iprop.exp @@ -5,11 +5,9 @@ proc setup_slave {} { global tmppwd hostname REALMNAME KDB5_UTIL file delete $tmppwd/slave-stash $tmppwd/slave-acl file copy -force $tmppwd/acl $tmppwd/slave-acl - if ![file exists $tmppwd/kpropdacl] { - set aclfile [open $tmppwd/kpropd-acl w] - puts $aclfile "host/$hostname@$REALMNAME" - close $aclfile - } + set aclfile [open $tmppwd/kpropd-acl w] + puts $aclfile "host/$hostname@$REALMNAME" + close $aclfile setup_slave_db # copy database - must be used after master db set up envstack_push |