diff options
| author | legend-hua <[email protected]> | 2016-11-01 05:55:40 +0800 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2016-10-31 14:55:40 -0700 |
| commit | 9f38f81ca38e62bc31af1d4086e0f7a963644d38 (patch) | |
| tree | 363980181499b29e323e29a8ccd469266628db91 | |
| parent | f26eb428622a6f3dc613d81faf905958e231e8b1 (diff) | |
Update migration tests
Due to the instability of the migration tests, the test will skip.
The migration tests focus on migrating test file from fs to ZFS fs.
We can create zpool and ext2 directly by loop device, rather than
by set_partition
Reviewed-by: Sydney Vanda <[email protected]>
Reviewed-by: Brian Behlendorf <[email protected]>
Signed-off-by: legend-hua <[email protected]>
Closes #5315
| -rwxr-xr-x | tests/zfs-tests/tests/functional/migration/setup.ksh | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/tests/zfs-tests/tests/functional/migration/setup.ksh b/tests/zfs-tests/tests/functional/migration/setup.ksh index 2381b5f85..b923256e0 100755 --- a/tests/zfs-tests/tests/functional/migration/setup.ksh +++ b/tests/zfs-tests/tests/functional/migration/setup.ksh @@ -34,10 +34,6 @@ verify_runnable "global" -if ! $(is_physical_device $ZFS_DISK) ; then - log_unsupported "Only partitionable physical disks can be used" -fi - case $DISK_COUNT in 0) log_untested "Need at least 1 disk device for test" @@ -50,10 +46,7 @@ case $DISK_COUNT in ;; esac -set_partition ${ZFSSIDE_DISK##*s} "" $FS_SIZE $ZFS_DISK -set_partition ${NONZFSSIDE_DISK##*s} "" $FS_SIZE $NONZFS_DISK - -create_pool $TESTPOOL "$ZFSSIDE_DISK" +create_pool $TESTPOOL "$ZFS_DISK" $RM -rf $TESTDIR || log_unresolved Could not remove $TESTDIR $MKDIR -p $TESTDIR || log_unresolved Could not create $TESTDIR @@ -64,10 +57,10 @@ log_must $ZFS set mountpoint=$TESTDIR $TESTPOOL/$TESTFS $RM -rf $NONZFS_TESTDIR || log_unresolved Could not remove $NONZFS_TESTDIR $MKDIR -p $NONZFS_TESTDIR || log_unresolved Could not create $NONZFS_TESTDIR -$ECHO "y" | $NEWFS -v ${DEV_DSKDIR}/$NONZFSSIDE_DISK +$ECHO "y" | $NEWFS -v ${DEV_DSKDIR}/$NONZFS_DISK (( $? != 0 )) && log_untested "Unable to setup a UFS file system" -log_must $MOUNT ${DEV_DSKDIR}/$NONZFSSIDE_DISK $NONZFS_TESTDIR +log_must $MOUNT ${DEV_DSKDIR}/$NONZFS_DISK $NONZFS_TESTDIR log_pass |