From e5030fbc2846c347f58e3a0bae436da84b98ef16 Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Fri, 17 Jan 2020 12:38:13 -0800 Subject: [PATCH] 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 Reviewed-by: Ryan Moeller Signed-off-by: Brian Behlendorf Closes #9853 --- tests/test-runner/bin/zts-report.py | 1 - .../cli_root/zpool_create/zpool_create_008_pos.ksh | 14 ++------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/tests/test-runner/bin/zts-report.py b/tests/test-runner/bin/zts-report.py index b61a1fde5e..a6937b52ce 100755 --- a/tests/test-runner/bin/zts-report.py +++ b/tests/test-runner/bin/zts-report.py @@ -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], diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh index 5c5c1d94dc..fa1d2b60c7 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_008_pos.ksh @@ -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