Author: brd (doc committer)
Date: Tue Feb 24 22:22:06 2015
New Revision: 279256
URL: https://svnweb.freebsd.org/changeset/base/279256
Log:
Fix a race condition by allowing up to 5 seconds of difference between the
time stamps.
PR: 197861
Approved by: will
Modified:
head/usr.sbin/pw/tests/pw_useradd.sh
Modified: head/usr.sbin/pw/tests/pw_useradd.sh
==============================================================================
--- head/usr.sbin/pw/tests/pw_useradd.sh Tue Feb 24 22:17:12 2015
(r279255)
+++ head/usr.sbin/pw/tests/pw_useradd.sh Tue Feb 24 22:22:06 2015
(r279256)
@@ -114,9 +114,11 @@ user_add_account_expiration_date_relativ
populate_etc_skel
EPOCH=`date -j -v+13m "+%s"`
+ BUF=`expr $EPOCH + 5`
atf_check -s exit:0 ${PW} useradd test -e +13o
- atf_check -s exit:0 -o match:"^test:\*:.*::0:${EPOCH}:User &:.*" \
- ${PW} usershow test
+ TIME=`${PW} usershow test | awk -F ':' '{print $7}'`
+ [ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
+ atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF
seconds."
}
# Test add user with password expiration as an epoch date
@@ -160,9 +162,11 @@ user_add_password_expiration_date_relati
populate_etc_skel
EPOCH=`date -j -v+13m "+%s"`
+ BUF=`expr $EPOCH + 5`
atf_check -s exit:0 ${PW} useradd test -p +13o
- atf_check -s exit:0 -o match:"^test:\*:.*::${EPOCH}:0:User &:.*" \
- ${PW} usershow test
+ TIME=`${PW} usershow test | awk -F ':' '{print $6}'`
+ [ ! -z $TIME -a $TIME -ge $EPOCH -a $TIME -lt $BUF ] || \
+ atf_fail "Expiration time($TIME) was not within $EPOCH - $BUF
seconds."
}
atf_init_test_cases() {
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
