ZTS: Enable zpool_create_008_pos.ksh
Remove the blkid version check from zpool_create_008_pos.ksh so the test case will not be skipped. All versions of blkid tested by the CI are either new enough to not suffer from this issue, or have been patched as is the case with CentOS 7 (libblkid-2.23.2-61). Additionally, add a block_device_wait after device partitioning to ensure the expected partitions will exist. Reviewed-by: George Melikov <mail@gmelikov.ru> Reviewed-by: Ryan Moeller <ryan@ixsystems.com> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #9853
This commit is contained in:
parent
31712a7ea8
commit
e5030fbc28
|
@ -191,7 +191,6 @@ maybe = {
|
|||
'cli_root/zfs_snapshot/zfs_snapshot_002_neg': ['FAIL', known_reason],
|
||||
'cli_root/zfs_unshare/setup': ['SKIP', share_reason],
|
||||
'cli_root/zpool_add/zpool_add_004_pos': ['FAIL', known_reason],
|
||||
'cli_root/zpool_create/zpool_create_008_pos': ['FAIL', known_reason],
|
||||
'cli_root/zpool_destroy/zpool_destroy_001_pos': ['SKIP', '6145'],
|
||||
'cli_root/zpool_import/import_rewind_device_replaced':
|
||||
['FAIL', rewind_reason],
|
||||
|
|
|
@ -44,18 +44,6 @@
|
|||
|
||||
verify_runnable "global"
|
||||
|
||||
if is_linux; then
|
||||
# Versions of libblkid older than 2.27.0 will not always detect member
|
||||
# devices of a pool, therefore skip this test case for old versions.
|
||||
currentver="$(blkid -v | tr ',' ' ' | awk '/libblkid/ { print $6 }')"
|
||||
requiredver="2.27.0"
|
||||
|
||||
if [ "$(printf "$requiredver\n$currentver" | sort -V | head -n1)" == \
|
||||
"$currentver" ] && [ "$currentver" != "$requiredver" ]; then
|
||||
log_unsupported "libblkid ($currentver) may not detect pools"
|
||||
fi
|
||||
fi
|
||||
|
||||
function cleanup
|
||||
{
|
||||
if [[ $exported_pool == true ]]; then
|
||||
|
@ -153,6 +141,8 @@ fi
|
|||
log_must zpool create -f $TESTPOOL $disk
|
||||
destroy_pool $TESTPOOL
|
||||
log_must partition_disk $SIZE $disk 6
|
||||
block_device_wait
|
||||
|
||||
create_pool $TESTPOOL ${disk}${SLICE_PREFIX}${SLICE0} \
|
||||
${disk}${SLICE_PREFIX}${SLICE1}
|
||||
log_must zpool export $TESTPOOL
|
||||
|
|
Loading…
Reference in New Issue