diff options
| author | Yuri Pankov <[email protected]> | 2017-05-24 07:11:47 -0400 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2017-05-25 17:52:27 -0700 |
| commit | bda77af11cc4041b2be39b7d02705bc8cec4cb2b (patch) | |
| tree | 94c5641f4102c7efbd281f5632669a42899bfcfa | |
| parent | ff770130538c2ca38a4ce041e0102b699fdd7608 (diff) | |
OpenZFS 8077 - zfs-tests suite fails zpool_get_002_pos
Authored by: Yuri Pankov <[email protected]>
Reviewed by: Matthew Ahrens <[email protected]>
Reviewed by: John Kennedy <[email protected]>
Approved by: Richard Lowe <[email protected]>
Reviewed-by: Giuseppe Di Natale <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Ported-by: bunder2015 <[email protected]>
Porting Notes:
* Also corrected a quoting mistake found in our copy
OpenZFS-issue: https://www.illumos.org/issues/8077
OpenZFS-commit: https://github.com/openzfs/openzfs/commit/481467d
Closes #6163
| -rw-r--r-- | tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg | 67 |
1 files changed, 48 insertions, 19 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg index f07f68abb..0ffd6f510 100644 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_get/zpool_get.cfg @@ -26,27 +26,56 @@ # # Copyright (c) 2013 by Delphix. All rights reserved. +# Copyright 2016 Nexenta Systems, Inc. All rights reserved. # # Set the expected properties of zpool +typeset -a properties=( + "size" + "capacity" + "altroot" + "health" + "guid" + "version" + "bootfs" + "delegation" + "autoreplace" + "cachefile" + "failmode" + "listsnapshots" + "autoexpand" + "dedupditto" + "dedupratio" + "free" + "allocated" + "readonly" + "comment" + "expandsize" + "freeing" + "fragmentation" + "leaked" + "feature@async_destroy" + "feature@empty_bpobj" + "feature@lz4_compress" + "feature@multi_vdev_crash_dump" + "feature@spacemap_histogram" + "feature@enabled_txg" + "feature@hole_birth" + "feature@extensible_dataset" + "feature@embedded_data" + "feature@bookmarks" + "feature@filesystem_limits" + "feature@large_blocks" + "feature@sha512" + "feature@skein" + "feature@edonr" +) + +# Additional properties added for Linux. if is_linux; then -typeset -a properties=("size" "capacity" "altroot" "health" "guid" "version" - "bootfs" "delegation" "autoreplace" "cachefile" "dedupditto" "dedupratio" - "free" "allocated" "readonly" "comment" "expandsize" "freeing" "failmode" - "listsnapshots" "autoexpand" "fragmentation" "leaked" "ashift" - "feature@async_destroy" "feature@empty_bpobj" "feature@lz4_compress" - "feature@large_blocks" "feature@large_dnode" "feature@filesystem_limits" - "feature@spacemap_histogram" "feature@enabled_txg" "feature@hole_birth" - "feature@extensible_dataset" "feature@bookmarks" "feature@embedded_data" - "feature@sha512" "feature@skein" "feature@edonr" - "feature@userobj_accounting" "feature@multi_vdev_crash_dump") -else -typeset -a properties=("size" "capacity" "altroot" "health" "guid" "version" - "bootfs" ""leaked" delegation" "autoreplace" "cachefile" "dedupditto" "dedupratio" - "free" "allocated" "readonly" "comment" "expandsize" "freeing" "failmode" - "listsnapshots" "autoexpand" "feature@async_destroy" "feature@empty_bpobj" - "feature@lz4_compress" "feature@multi_vdev_crash_dump" - "feature@spacemap_histogram" "feature@enabled_txg" "feature@hole_birth" - "feature@extensible_dataset" "feature@bookmarks" "feature@sha512" - "feature@skein" "feature@edonr") + properties+=( + "ashift" + "feature@large_dnode" + "feature@userobj_accounting" + ) fi |