diff options
| author | Richard Laager <[email protected]> | 2020-02-18 11:36:50 -0600 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-02-18 09:36:50 -0800 |
| commit | f2448464623f240002a0dff0f4617dec4c2cdefe (patch) | |
| tree | 6df080605d098645ffa30255182be4e7680be24b /tests/zfs-tests | |
| parent | fb63fc0c0398baf2250eea8a7e0ddb4760d59e5e (diff) | |
Prefer org.openzfs for features and properties
Moving forward, we wish to use org.openzfs (no dash) rather than
org.open-zfs or org.zfsonlinux for feature GUIDs and property names.
The existing feature GUIDs cannot be changed.
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Ryan Moeller <[email protected]>
Signed-off-by: Richard Laager <[email protected]>
Closes #10003
Diffstat (limited to 'tests/zfs-tests')
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh index ab2a9508e..87997e76c 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send-b.ksh @@ -52,8 +52,8 @@ log_must zfs snapshot "$SENDFS@s1" log_must zfs bookmark "$SENDFS@s1" "$SENDFS#bm" log_must zfs snapshot "$SENDFS@s2" log_must zfs set "compression=gzip" $SENDFS -log_must zfs set "org.zfsonlinux:prop=val" $SENDFS -log_must zfs set "org.zfsonlinux:snapprop=val" "$SENDFS@s1" +log_must zfs set "org.openzfs:prop=val" $SENDFS +log_must zfs set "org.openzfs:snapprop=val" "$SENDFS@s1" # 2. Verify command line options interact with '-b' correctly typeset opts=("" "p" "Rp" "cew" "nv" "D" "DLPRcenpvw") @@ -78,21 +78,21 @@ for opt in ${opts[@]}; do # NOTE: override "received" values and set some new properties as well log_must zfs set "compression=lz4" $BACKUP log_must zfs set "exec=off" $BACKUP - log_must zfs set "org.zfsonlinux:prop=newval" $BACKUP - log_must zfs set "org.zfsonlinux:newprop=newval" $BACKUP - log_must zfs set "org.zfsonlinux:snapprop=newval" "$BACKUP@s1" - log_must zfs set "org.zfsonlinux:newsnapprop=newval" "$BACKUP@s1" + log_must zfs set "org.openzfs:prop=newval" $BACKUP + log_must zfs set "org.openzfs:newprop=newval" $BACKUP + log_must zfs set "org.openzfs:snapprop=newval" "$BACKUP@s1" + log_must zfs set "org.openzfs:newsnapprop=newval" "$BACKUP@s1" # 5. Restore the "backup" dataset to a new destination log_must eval "zfs send -b$opt $BACKUP@s1 | zfs recv $RESTORE" # 6. Verify only original (received) properties are sent from "backup" log_must eval "check_prop_source $RESTORE compression gzip received" - log_must eval "check_prop_source $RESTORE org.zfsonlinux:prop val received" - log_must eval "check_prop_source $RESTORE@s1 org.zfsonlinux:snapprop val received" + log_must eval "check_prop_source $RESTORE org.openzfs:prop val received" + log_must eval "check_prop_source $RESTORE@s1 org.openzfs:snapprop val received" log_must eval "check_prop_source $RESTORE exec on default" - log_must eval "check_prop_missing $RESTORE org.zfsonlinux:newprop" - log_must eval "check_prop_missing $RESTORE@s1 org.zfsonlinux:newsnapprop" + log_must eval "check_prop_missing $RESTORE org.openzfs:newprop" + log_must eval "check_prop_missing $RESTORE@s1 org.openzfs:newsnapprop" # cleanup log_must zfs destroy -r $BACKUP |