tests/generic: remove recover-failed device

When device recovery fails, log the failure and remove the device, otherwise, it may cause device leak. Signed-off-by: Ming Lei <[email protected]>
ublk-org · Jun 5, 2024 · b8bc26c · b8bc26c
1 parent 30f52dc
commit b8bc26c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/tests/generic/005 b/tests/generic/005
@@ -63,14 +63,13 @@ ublk_run_recover_test()
 			let secs++
 		done
 		if [ $RES -ne 0 ]; then
-				echo -e "\trecover $DEV failed"
-				exit -1
+			echo -e "\trecover $DEV failed"
 		fi
 		sleep 2
 		RES=`__remove_ublk_dev_return $DEV`
 		if [ $RES -ne 0 ]; then
-				echo -e "\tdelete $DEV failed"
-				exit -1
+			echo -e "\tdelete $DEV failed"
+			break
 		fi
 		wait
 		sleep 3
@@ -80,6 +79,6 @@ ublk_run_recover_test()
 
 for TGT in $ALL_TGTS; do
 	for RECOVERY_REISSUE in `seq 0 1`; do
-			ublk_run_recover_test $TGT
+		ublk_run_recover_test $TGT
 	done
 done
diff --git a/tests/generic/006 b/tests/generic/006
@@ -43,8 +43,7 @@ ublk_run_recover_kill_test()
 			let secs++
 		done
 		if [ $RES -ne 0 ]; then
-				echo -e "\trecover $DEV failed"
-				exit -1
+			echo -e "\trecover $DEV failed"
 		fi
 		sleep 2
         pid2=`__ublk_get_pid $DEV`
@@ -53,13 +52,13 @@ ublk_run_recover_kill_test()
 		RES=`__remove_ublk_dev_return $DEV`
 		if [ $RES -ne 0 ]; then
 				echo -e "\tdelete $DEV failed"
-				exit -1
+				break
 		fi
 		wait
 		sleep 3
 	done
 }
 
 for RECOVERY_REISSUE in `seq 0 1`; do
-		ublk_run_recover_kill_test
+	ublk_run_recover_kill_test
 done