c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 10:21:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use compatible arg order in tests

Browse Source 
BSD getopt() and getopt_long() want options before arguments.
Reorder arguments to zfs/zpool in tests to put all the options first.

Reviewed-by: Igor Kozhukhov <igor@dilos.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@ixsystems.com>
Closes #9228
This commit is contained in:
Ryan Moeller 2019-08-29 14:03:09 -04:00 committed by Tony Hutter
parent 16f42e1b6d
commit 2f1f18a6b4
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/zfs-tests/tests/functional/alloc_class/alloc_class_004_pos.ksh
View File

@ -52,7 +52,7 @@ do
log_must zpool create $TESTPOOL $type $ZPOOL_DISKS \ log_must zpool create $TESTPOOL $type $ZPOOL_DISKS \
special $stype $sdisks special $stype $sdisks
ac_value="$(zpool get all -H -o property,value | \ ac_value="$(zpool get -H -o property,value all | \
egrep allocation_classes | nawk '{print $2}')" egrep allocation_classes | nawk '{print $2}')"
if [ "$ac_value" = "active" ]; then if [ "$ac_value" = "active" ]; then
log_note "feature@allocation_classes is active" log_note "feature@allocation_classes is active"

4
tests/zfs-tests/tests/functional/alloc_class/alloc_class_005_pos.ksh
View File

@ -41,7 +41,7 @@ do
else else
log_must zpool create $TESTPOOL $type $ZPOOL_DISKS log_must zpool create $TESTPOOL $type $ZPOOL_DISKS
fi fi
ac_value="$(zpool get all -H -o property,value | \ ac_value="$(zpool get -H -o property,value all | \
egrep allocation_classes | awk '{print $2}')" egrep allocation_classes | awk '{print $2}')"
if [ "$ac_value" = "enabled" ]; then if [ "$ac_value" = "enabled" ]; then
log_note "feature@allocation_classes is enabled" log_note "feature@allocation_classes is enabled"
@ -56,7 +56,7 @@ do
log_must zpool add $TESTPOOL special mirror \ log_must zpool add $TESTPOOL special mirror \
$CLASS_DISK0 $CLASS_DISK1 $CLASS_DISK0 $CLASS_DISK1
fi fi
ac_value="$(zpool get all -H -o property,value | \ ac_value="$(zpool get -H -o property,value all | \
egrep allocation_classes | awk '{print $2}')" egrep allocation_classes | awk '{print $2}')"
if [ "$ac_value" = "active" ]; then if [ "$ac_value" = "active" ]; then
log_note "feature@allocation_classes is active" log_note "feature@allocation_classes is active"

10
tests/zfs-tests/tests/functional/cli_root/zfs_program/zfs_program_json.ksh
View File

@ -95,10 +95,10 @@ typeset -i cnt=0
typeset cmd typeset cmd
for cmd in ${pos_cmds[@]}; do for cmd in ${pos_cmds[@]}; do
log_must zfs program $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 log_must zfs program $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1
log_must zfs program $TESTPOOL -j $TESTZCP $TESTDS $cmd 2>&1 log_must zfs program -j $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1
# json.tool is needed to guarantee consistent ordering of fields # json.tool is needed to guarantee consistent ordering of fields
# sed is needed to trim trailing space in CentOS 6's json.tool output # sed is needed to trim trailing space in CentOS 6's json.tool output
OUTPUT=$(zfs program $TESTPOOL -j $TESTZCP $TESTDS $cmd 2>&1 | python -m json.tool | sed 's/[[:space:]]*$//') OUTPUT=$(zfs program -j $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 | python -m json.tool | sed 's/[[:space:]]*$//')
if [ "$OUTPUT" != "${pos_cmds_out[$cnt]}" ]; then if [ "$OUTPUT" != "${pos_cmds_out[$cnt]}" ]; then
log_note "Got :$OUTPUT" log_note "Got :$OUTPUT"
log_note "Expected:${pos_cmds_out[$cnt]}" log_note "Expected:${pos_cmds_out[$cnt]}"
@ -120,9 +120,9 @@ For the property list, run: zfs set|get
For the delegated permission list, run: zfs allow|unallow") For the delegated permission list, run: zfs allow|unallow")
cnt=0 cnt=0
for cmd in ${neg_cmds[@]}; do for cmd in ${neg_cmds[@]}; do
log_mustnot zfs program $TESTPOOL $TESTZCP $TESTDS $cmd 2>&1 log_mustnot zfs program $cmd $TESTPOOL $TESTZCP $TESTDS 2>&1
log_mustnot zfs program $TESTPOOL -j $TESTZCP $TESTDS $cmd 2>&1 log_mustnot zfs program -j $cmd $TESTPOOL $TESTZCP $TESTDS 2>&1
OUTPUT=$(zfs program $TESTPOOL -j $TESTZCP $TESTDS $cmd 2>&1) OUTPUT=$(zfs program -j $cmd $TESTPOOL $TESTZCP $TESTDS 2>&1)
if [ "$OUTPUT" != "${neg_cmds_out[$cnt]}" ]; then if [ "$OUTPUT" != "${neg_cmds_out[$cnt]}" ]; then
log_note "Got :$OUTPUT" log_note "Got :$OUTPUT"
log_note "Expected:${neg_cmds_out[$cnt]}" log_note "Expected:${neg_cmds_out[$cnt]}"