diff options
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh | 3 | ||||
| -rwxr-xr-x | tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh | 7 |
2 files changed, 0 insertions, 10 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh index f4f317cbe..fd67dc769 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh @@ -40,9 +40,6 @@ for pool in "$TESTPOOL" "$TESTPOOL1"; do destroy_pool "$pool" done -ismounted $DEVICE_DIR $NEWFS_DEFAULT_FS -(( $? == 0 )) && log_must umount -f $DEVICE_DIR - for dir in "$TESTDIR" "$TESTDIR1" "$DEVICE_DIR" ; do [[ -d $dir ]] && \ log_must rm -rf $dir diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh index d81e66636..9f0ccfb6c 100755 --- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh +++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh @@ -68,16 +68,9 @@ fi log_must zfs create $TESTPOOL/$TESTFS log_must zfs set mountpoint=$TESTDIR $TESTPOOL/$TESTFS -DISK2="$(echo $DISKS | nawk '{print $2}')" -echo "y" | newfs -v $DEV_DSKDIR/$DISK2 >/dev/null 2>&1 -(( $? != 0 )) && - log_untested "Unable to setup a $NEWFS_DEFAULT_FS file system" - [[ ! -d $DEVICE_DIR ]] && \ log_must mkdir -p $DEVICE_DIR -log_must mount $DEV_DSKDIR/$DISK2 $DEVICE_DIR - i=0 while (( i < $MAX_NUM )); do log_must mkfile $FILE_SIZE ${DEVICE_DIR}/${DEVICE_FILE}$i |