Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Streamline the zpool_import tests 

Don't create an ext4 file system atop $DEV_DISKDIR/$DISK2.
There's likely to not be sufficient space for it to succeed.
Instead, simply create the vdev files in the directory where it
would have been mounted.

Signed-off-by: Tim Chase <tim@chase2k.com>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #7459
This commit is contained in:
Tim Chase 2018-05-03 23:02:38 -05:00 committed by Brian Behlendorf
parent a0ad7ca54e
commit f3d28f0a59
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/zfs-tests/tests/functional/cli_root/zpool_import/cleanup.ksh
View File

@ -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

7
tests/zfs-tests/tests/functional/cli_root/zpool_import/setup.ksh
View File

@ -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