c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-04-06 17:49:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Fix non-portable date format

Browse Source 
The delegate tests use `date(1)` to generate snapshot names, using
the format '%F-%T-%N' to get nanosecond resolution (since multiple
snapshots may be taken in the same second).  '%N' is not portable, and
causes tests to fail on FreeBSD.

Since the only purpose these timestamps serve is to create a unique
name, simply use $RANDOM instead.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10170
This commit is contained in:
Ryan Moeller 2020-04-06 19:07:35 -04:00 committed by GitHub
parent 5a42ef04fd
commit 4a21ec0560
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
View File

@ -379,7 +379,7 @@ function verify_send
typeset dtst=$3 typeset dtst=$3
typeset oldval typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$dtst@snap.$stamp typeset snap=$dtst@snap.$stamp
typeset -i ret=1 typeset -i ret=1
@ -408,7 +408,7 @@ function verify_fs_receive
typeset fs=$3 typeset fs=$3
typeset dtst typeset dtst
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset newfs=$fs/newfs.$stamp typeset newfs=$fs/newfs.$stamp
typeset newvol=$fs/newvol.$stamp typeset newvol=$fs/newvol.$stamp
typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
@ -480,7 +480,7 @@ function verify_userprop
typeset perm=$2 typeset perm=$2
typeset dtst=$3 typeset dtst=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
user_run $user zfs set "$user:ts=$stamp" $dtst user_run $user zfs set "$user:ts=$stamp" $dtst
zpool sync ${dtst%%/*} zpool sync ${dtst%%/*}
@ -565,7 +565,7 @@ function verify_fs_create
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset newfs=$fs/nfs.$stamp typeset newfs=$fs/nfs.$stamp
typeset newvol=$fs/nvol.$stamp typeset newvol=$fs/nvol.$stamp
@ -693,7 +693,7 @@ function verify_fs_snapshot
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$fs@snap.$stamp typeset snap=$fs@snap.$stamp
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
@ -737,7 +737,7 @@ function verify_fs_rollback
typeset fs=$3 typeset fs=$3
typeset oldval typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$fs@snap.$stamp typeset snap=$fs@snap.$stamp
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
@ -770,7 +770,7 @@ function verify_fs_clone
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*} typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp typeset snap=$fs@snap.$stamp
typeset clone=$basefs/cfs.$stamp typeset clone=$basefs/cfs.$stamp
@ -815,7 +815,7 @@ function verify_fs_rename
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*} typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp typeset snap=$fs@snap.$stamp
typeset renamefs=$basefs/nfs.$stamp typeset renamefs=$basefs/nfs.$stamp
@ -898,7 +898,7 @@ function verify_fs_mount
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
@ -966,7 +966,7 @@ function verify_fs_mountpoint
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset mntpt=$(get_prop mountpoint $fs) typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp
@ -1005,7 +1005,7 @@ function verify_fs_promote
typeset perm=$2 typeset perm=$2
typeset fs=$3 typeset fs=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*} typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp typeset snap=$fs@snap.$stamp
typeset clone=$basefs/cfs.$stamp typeset clone=$basefs/cfs.$stamp
@ -1061,7 +1061,7 @@ function verify_fs_canmount
typeset fs=$3 typeset fs=$3
typeset oldval typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
if ! ismounted $fs ; then if ! ismounted $fs ; then
set -A modes "on" "off" set -A modes "on" "off"
@ -1372,7 +1372,7 @@ function verify_vol_snapshot
typeset perm=$2 typeset perm=$2
typeset vol=$3 typeset vol=$3
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*} typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp typeset snap=$vol@snap.$stamp
@ -1397,7 +1397,7 @@ function verify_vol_rollback
typeset perm=$2 typeset perm=$2
typeset vol=$3 typeset vol=$3
typeset stamp=${perm}.${user}.$(date+'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*} typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp typeset snap=$vol@snap.$stamp
@ -1432,7 +1432,7 @@ function verify_vol_clone
typeset perm=$2 typeset perm=$2
typeset vol=$3 typeset vol=$3
typeset stamp=${perm}.${user}.$(date+'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*} typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp typeset clone=$basevol/cvol.$stamp
@ -1478,7 +1478,7 @@ function verify_vol_rename
typeset perm=$2 typeset perm=$2
typeset vol=$3 typeset vol=$3
typeset stamp=${perm}.${user}.$(date+'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*} typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp typeset clone=$basevol/cvol.$stamp
@ -1525,7 +1525,7 @@ function verify_vol_promote
typeset perm=$2 typeset perm=$2
typeset vol=$3 typeset vol=$3
typeset stamp=${perm}.${user}.$(date+'%F-%T-%N') typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*} typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp typeset clone=$basevol/cvol.$stamp

1
tests/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh
View File

@ -51,7 +51,6 @@ longset="set123456789012345678901234567890123456789012345678901234567890123"
for dtst in $DATASETS ; do for dtst in $DATASETS ; do
log_mustnot eval "zfs allow -s @$longset $dtst" log_mustnot eval "zfs allow -s @$longset $dtst"
# Create non-existent permission set # Create non-existent permission set
typeset timestamp=$(date +'%F-%R:%S')
log_mustnot zfs allow -s @non-existent $dtst log_mustnot zfs allow -s @non-existent $dtst
log_mustnot zfs allow $STAFF "atime,created,mounted" $dtst log_mustnot zfs allow $STAFF "atime,created,mounted" $dtst
log_mustnot zfs allow $dtst $TESTPOOL log_mustnot zfs allow $dtst $TESTPOOL