]> git.proxmox.com Git - mirror_zfs.git/commitdiff
Fix zconfig.sh test 9
authorBrian Behlendorf <behlendorf1@llnl.gov>
Fri, 7 Feb 2014 18:54:11 +0000 (10:54 -0800)
committerBrian Behlendorf <behlendorf1@llnl.gov>
Mon, 10 Feb 2014 23:48:32 +0000 (15:48 -0800)
Commit ba6a240 adjusted the behavior of 'zfs create -V'.  The
caller is no longer guaranteed that udev will have finished
creating the /dev/ entries by the time to command exits.  It
is therefore required that we explicitly block waiting for
udev to settle for this test to run reliably.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
scripts/zconfig.sh

index 622bb28f17ba352618966a8397b8272cfe0e946b..d6695be7239043ad4ae7abbb4f81288c9f4d77f4 100755 (executable)
@@ -554,6 +554,7 @@ test_9() {
        ${ZFS_SH} zfs="spa_config_path=${TMP_CACHE}" || fail 1
        ${ZPOOL_CREATE_SH} -p ${POOL_NAME} -c lo-raidz2 || fail 2
        ${ZFS} create -V 300M ${FULL_NAME} || fail 3
+       udev_trigger
 
        # Dump the events, there should be at least 5 lines.
        ${ZPOOL} events >${TMP_EVENTS} || fail 4