From 0a43fe282a0cd70ff86d2f45dfc0dd11997ac735 Mon Sep 17 00:00:00 2001 From: Shuhei Matsumoto Date: Thu, 21 Jun 2018 16:31:51 +0900 Subject: [PATCH] test/iscsi: Change the order of delete_bdev that hides uncorrect hotplug implementation Change-Id: I1d24e842e3ebfff84bda10dfd9c05d3b7d94a967 Signed-off-by: Shuhei Matsumoto Reviewed-on: https://review.gerrithub.io/416276 Tested-by: SPDK Automated Test System Reviewed-by: Jim Harris Reviewed-by: Daniel Verkamp Reviewed-by: Ziye Yang Reviewed-by: Ben Walker --- test/iscsi_tgt/filesystem/filesystem.sh | 2 +- test/iscsi_tgt/multiconnection/multiconnection.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/iscsi_tgt/filesystem/filesystem.sh b/test/iscsi_tgt/filesystem/filesystem.sh index f43b0e99c..1ec388899 100755 --- a/test/iscsi_tgt/filesystem/filesystem.sh +++ b/test/iscsi_tgt/filesystem/filesystem.sh @@ -125,7 +125,7 @@ rm -rf /mnt/device trap - SIGINT SIGTERM EXIT -remove_backends iscsicleanup +remove_backends killprocess $pid timing_exit filesystem diff --git a/test/iscsi_tgt/multiconnection/multiconnection.sh b/test/iscsi_tgt/multiconnection/multiconnection.sh index 464973039..08fd0460c 100755 --- a/test/iscsi_tgt/multiconnection/multiconnection.sh +++ b/test/iscsi_tgt/multiconnection/multiconnection.sh @@ -86,10 +86,10 @@ $fio_py 262144 16 randwrite 10 sync trap - SIGINT SIGTERM EXIT -remove_backends rm -f $testdir/iscsi.conf rm -f ./local-job* iscsicleanup +remove_backends killprocess $iscsipid timing_exit multiconnection