diff options
| author | Ken Raeburn <raeburn@mit.edu> | 2009-02-02 20:37:41 +0000 |
|---|---|---|
| committer | Ken Raeburn <raeburn@mit.edu> | 2009-02-02 20:37:41 +0000 |
| commit | b533153ba93bc4bb993ec920929124ed9f50c683 (patch) | |
| tree | d22cff888318a3107cda8dba879674f7659ae5d8 /src/kadmin/passwd | |
| parent | 8306873be29e0d9690f43f655a21abf543393e62 (diff) | |
| download | krb5-b533153ba93bc4bb993ec920929124ed9f50c683.tar.gz krb5-b533153ba93bc4bb993ec920929124ed9f50c683.tar.xz krb5-b533153ba93bc4bb993ec920929124ed9f50c683.zip | |
Revise last change to better resemble the original test, keeping the
min-lifetime test code collected together. Change policy to have a
minimum password lifetime of 10s instead of 30s, and reduce the test
delays accordingly.
ticket: 6358
git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@21868 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/kadmin/passwd')
| -rw-r--r-- | src/kadmin/passwd/unit-test/kpasswd.0/changing.exp | 39 |
1 files changed, 18 insertions, 21 deletions
diff --git a/src/kadmin/passwd/unit-test/kpasswd.0/changing.exp b/src/kadmin/passwd/unit-test/kpasswd.0/changing.exp index 25c2a59c4..3d7dc4bfd 100644 --- a/src/kadmin/passwd/unit-test/kpasswd.0/changing.exp +++ b/src/kadmin/passwd/unit-test/kpasswd.0/changing.exp @@ -12,22 +12,7 @@ if [info exist env(DEBUG)] { debug 1 } # Here are the tests # -# Under "make check", init_db will just have been run and we could -# jump right into the too-soon test. But if someone is working with -# the test suite manually, init_db may have been run a while ago. -# So, force some known state, first. -verbose "(sleeping 30 seconds so pol2 password can be changed)" -sleep 30 - -test_win {pol2} {successful change} pol2 pol222222 polbbbbbb - -set pol2_time [expr 31 + [timestamp]] - -test_3pass {pol2} {D.15: too soon to change password} pol2 \ - polbbbbbb pol333333 pol333333 \ - 4 {Password cannot be changed because it was changed too recently. Please wait until .*[12][0-9][0-9][0-9] before you change it. If you need to change your password before then, contact your system security administrator.} - -# +set pol2_time [timestamp] test_3pass {test2} {D.5: different new passwords} test2 test2 test2 foobar \ 4 {New passwords do not match - password not changed.} @@ -106,11 +91,23 @@ test_win {pol1} {successful change} pol1 polAAAAAA polBBBBBB test_win {pol1} {successful change} pol1 polBBBBBB polCCCCCC test_win {pol1} {successful change} pol1 polCCCCCC pol111111 -# Now delay a little longer (if needed) and try changing pol2's -# password again. -set delay [expr $pol2_time - [timestamp]] -verbose "(sleeping $delay seconds)" +# Under "make check", init_db will just have been run and we could +# jump right into the too-soon test. But if someone is working with +# the test suite manually, init_db may have been run a while ago. +# So, force some known state, first. +set delay [expr $pol2_time + 11 - [timestamp]] +verbose "(sleeping $delay seconds so pol2 password can be changed)" sleep $delay -test_win {pol2} {password min life passed} pol2 polbbbbbb pol333333 +test_win {pol2} {successful change} pol2 pol222222 polbbbbbb + +test_3pass {pol2} {D.15: too soon to change password} pol2 \ + polbbbbbb pol222222 pol222222 \ + 4 {Password cannot be changed because it was changed too recently. Please wait until .*[12][0-9][0-9][0-9] before you change it. If you need to change your password before then, contact your system security administrator.} + +# Now delay a little longer (if needed) and try changing pol2's +# password again. +verbose "(sleeping 10 seconds)" +sleep 10 +test_win {pol2} {password min life passed} pol2 polbbbbbb pol222222 |