Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ZTS: Fix non-portable date format #10170

Merged
merged 1 commit into from
Apr 6, 2020
Merged

ZTS: Fix non-portable date format #10170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions tests/zfs-tests/tests/functional/delegate/delegate_common.kshlib
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ function verify_send
typeset dtst=$3

typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$dtst@snap.$stamp

typeset -i ret=1
Expand Down Expand Up @@ -408,7 +408,7 @@ function verify_fs_receive
typeset fs=$3

typeset dtst
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset newfs=$fs/newfs.$stamp
typeset newvol=$fs/newvol.$stamp
typeset bak_user=$TEST_BASE_DIR/bak.$user.$stamp
Expand Down Expand Up @@ -480,7 +480,7 @@ function verify_userprop
typeset perm=$2
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
zpool sync ${dtst%%/*}
Expand Down Expand Up @@ -565,7 +565,7 @@ function verify_fs_create
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset newfs=$fs/nfs.$stamp
typeset newvol=$fs/nvol.$stamp

Expand Down Expand Up @@ -693,7 +693,7 @@ function verify_fs_snapshot
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$fs@snap.$stamp
typeset mntpt=$(get_prop mountpoint $fs)

Expand Down Expand Up @@ -737,7 +737,7 @@ function verify_fs_rollback
typeset fs=$3

typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset snap=$fs@snap.$stamp
typeset mntpt=$(get_prop mountpoint $fs)

Expand Down Expand Up @@ -770,7 +770,7 @@ function verify_fs_clone
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp
typeset clone=$basefs/cfs.$stamp
Expand Down Expand Up @@ -815,7 +815,7 @@ function verify_fs_rename
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp
typeset renamefs=$basefs/nfs.$stamp
Expand Down Expand Up @@ -898,7 +898,7 @@ function verify_fs_mount
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp

Expand Down Expand Up @@ -966,7 +966,7 @@ function verify_fs_mountpoint
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset mntpt=$(get_prop mountpoint $fs)
typeset newmntpt=$TEST_BASE_DIR/mnt.$stamp

Expand Down Expand Up @@ -1005,7 +1005,7 @@ function verify_fs_promote
typeset perm=$2
typeset fs=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basefs=${fs%/*}
typeset snap=$fs@snap.$stamp
typeset clone=$basefs/cfs.$stamp
Expand Down Expand Up @@ -1061,7 +1061,7 @@ function verify_fs_canmount
typeset fs=$3

typeset oldval
typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM

if ! ismounted $fs ; then
set -A modes "on" "off"
Expand Down Expand Up @@ -1372,7 +1372,7 @@ function verify_vol_snapshot
typeset perm=$2
typeset vol=$3

typeset stamp=${perm}.${user}.$(date +'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp

Expand All @@ -1397,7 +1397,7 @@ function verify_vol_rollback
typeset perm=$2
typeset vol=$3

typeset stamp=${perm}.${user}.$(date+'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp

Expand Down Expand Up @@ -1432,7 +1432,7 @@ function verify_vol_clone
typeset perm=$2
typeset vol=$3

typeset stamp=${perm}.${user}.$(date+'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp
Expand Down Expand Up @@ -1478,7 +1478,7 @@ function verify_vol_rename
typeset perm=$2
typeset vol=$3

typeset stamp=${perm}.${user}.$(date+'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp
Expand Down Expand Up @@ -1525,7 +1525,7 @@ function verify_vol_promote
typeset perm=$2
typeset vol=$3

typeset stamp=${perm}.${user}.$(date+'%F-%T-%N')
typeset stamp=${perm}.${user}.$RANDOM
typeset basevol=${vol%/*}
typeset snap=$vol@snap.$stamp
typeset clone=$basevol/cvol.$stamp
Expand Down
1 change: 0 additions & 1 deletion tests/zfs-tests/tests/functional/delegate/zfs_allow_009_neg.ksh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ longset="set123456789012345678901234567890123456789012345678901234567890123"
for dtst in $DATASETS ; do
log_mustnot eval "zfs allow -s @$longset $dtst"
# Create non-existent permission set
typeset timestamp=$(date +'%F-%R:%S')
log_mustnot zfs allow -s @non-existent $dtst
log_mustnot zfs allow $STAFF "atime,created,mounted" $dtst
log_mustnot zfs allow $dtst $TESTPOOL
Expand Down