From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Thu, 22 Aug 2019 15:53:44 +0000 (-0700)
Subject: ZTS: Fix vdev_zaps_005_pos on CentOS 6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=20f7b917aaabd16b41321e9c4dc9f11996ca3683;p=zfs

ZTS: Fix vdev_zaps_005_pos on CentOS 6

The ancient version of blkid (v2.17.2) used in CentOS 6 will not
detect the newly created pool unless it has been written to.
Force a pool sync so `zpool import` will detect the newly created
pool.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9199
---

diff --git a/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_005_pos.ksh b/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_005_pos.ksh
index 8cf8e6d40..066be917e 100755
--- a/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_005_pos.ksh
+++ b/tests/zfs-tests/tests/functional/vdev_zaps/vdev_zaps_005_pos.ksh
@@ -41,6 +41,7 @@ orig_top=$(get_top_vd_zap $DISK $conf)
 orig_leaf=$(get_leaf_vd_zap $DISK $conf)
 assert_zap_common $TESTPOOL $DISK "top" $orig_top
 assert_zap_common $TESTPOOL $DISK "leaf" $orig_leaf
+log_must zpool sync
 
 # Export the pool.
 log_must zpool export $TESTPOOL