From: Bart Van Assche <bvanassche@acm.org>
Date: Mon, 17 Sep 2018 16:59:38 +0000 (-0700)
Subject: tests/srp: Remove /etc/multipath.conf after a test has finished
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ad30525164ad8193df6175b9ce6e6536309ec68;p=users%2Fsagi%2Fblktests.git

tests/srp: Remove /etc/multipath.conf after a test has finished

Instead of removing /etc/multipath.conf before a test starts, remove it
after a test has finished. This change is needed to let the nvmeof-mp
tests run after the srp tests have been run.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
---

diff --git a/tests/srp/rc b/tests/srp/rc
index 4bddcad..a125e63 100755
--- a/tests/srp/rc
+++ b/tests/srp/rc
@@ -103,12 +103,6 @@ group_requires() {
 		SKIP_REASON="/etc/multipath.conf already exists"
 		return 1
 	fi
-	if [ ! -e /etc/multipath.conf ]; then
-		(
-			srcdir=$PWD
-			cd /etc && ln -s "$srcdir/tests/srp/multipath.conf" .
-		)
-	fi
 }
 
 # Log out, set dm and SCSI use_blk_mq parameters and log in. $1: device mapper
@@ -1188,6 +1182,7 @@ shutdown_client() {
 # Undo setup()
 teardown() {
 	killall -9 multipathd >&/dev/null
+	rm -f /etc/multipath.conf
 	stop_target
 	unload_null_blk
 }
@@ -1222,6 +1217,12 @@ setup() {
 
 	configure_null_blk
 
+	if [ ! -e /etc/multipath.conf ]; then
+		(
+			srcdir=$PWD
+			cd /etc && ln -s "$srcdir/tests/srp/multipath.conf" .
+		)
+	fi
 	multipathd
 
 	# Load the I/O scheduler kernel modules