summaryrefslogtreecommitdiffstats
path: root/tests/zfs-tests
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2018-05-07 21:08:33 -0700
committerGitHub <[email protected]>2018-05-07 21:08:33 -0700
commitc02c1becce96969ea20a2e142dd451cc37d2a9a0 (patch)
treea4eeacb9d8e5b1e09bd1c8be122198e3e6387ef4 /tests/zfs-tests
parenta82a4a15be9559b20ec8e8df1430fc4c901d0b69 (diff)
ZTS: Re-enable MMP tests
Commit 7fab6361 inadvertently disabled the MMP test cases by creating and not removing an /etc/hostid file in the new zpool_split_props test case. When the file exists the ZTS skips the entire MMP test group rather than modify what may be a system which is already configured. Update the test case to remove the file. Additionally, because the MMP tests were disabled a regression slipped in as part of commit 9eb7b46ed0. Fix it. Reviewed-by: Tim Chase <[email protected]> Reviewed-by: Giuseppe Di Natale <[email protected]> Reviewed-by: loli10K <[email protected]> Signed-off-by: Brian Behlendorf <[email protected]> Closes #7514
Diffstat (limited to 'tests/zfs-tests')
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh13
1 files changed, 11 insertions, 2 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh
index 90cde544e..6176adf8b 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_split/zpool_split_props.ksh
@@ -15,6 +15,7 @@
#
. $STF_SUITE/include/libtest.shlib
+. $STF_SUITE/tests/functional/mmp/mmp.kshlib
#
# DESCRIPTION:
@@ -33,6 +34,7 @@ function cleanup
destroy_pool $TESTPOOL
destroy_pool $TESTPOOL2
rm -f $DEVICE1 $DEVICE2
+ log_must mmp_clear_hostid
}
function setup_mirror
@@ -45,6 +47,10 @@ function setup_mirror
log_assert "'zpool split' can set new property values on the new pool"
log_onexit cleanup
+if [ -e $HOSTID_FILE ]; then
+ log_unsupported "System has existing $HOSTID_FILE file"
+fi
+
typeset good_props=('comment=text' 'ashift=12' 'multihost=on'
'listsnapshots=on' 'autoexpand=on' 'autoreplace=on' 'dedupditto=1234'
'delegation=off' 'failmode=continue')
@@ -57,7 +63,7 @@ DEVICE1="$TEST_BASE_DIR/device-1"
DEVICE2="$TEST_BASE_DIR/device-2"
# Needed to set multihost=on
-zgenhostid
+log_must mmp_set_hostid $HOSTID1
# Verify we can set a combination of valid property values on the new pool
for prop in "${good_props[@]}"
@@ -68,7 +74,10 @@ do
log_must zpool split -o $prop $TESTPOOL $TESTPOOL2
log_must zpool import -N -d $TEST_BASE_DIR $TESTPOOL2
log_must test "$(get_pool_prop $propname $TESTPOOL2)" == "$propval"
- cleanup
+
+ destroy_pool $TESTPOOL
+ destroy_pool $TESTPOOL2
+ rm -f $DEVICE1 $DEVICE2
done
# Verify we cannot set invalid property values