check: call _unload_module() after fallback_device_cleanup()

As described in the commit message of the previous commit,
_unload_module() is called before calling cleanup_fallback_device().
Then, modules that is not cleaned up can be unloaded by _unload_module()
and can cause unload failures.

To avoid the failures, move _unload_module() call into
_check_and_call_test_device() so that it is called after the
cleanup_fallback_device() call. After this change, the call chain
becomes as follows:

  _run_test
    _check_and_call_test_device
      fallback_device
      _call_test
      cleanup_fallback_device
      _unload_modules

This change requires to add _unload_modules() call to
_check_and_call_test() and _check_and_call_test_device_array() also.

Fixes: 756d18d ("check: call _unload_modules for each test run")
Signed-off-by: Shin'ichiro Kawasaki <[email protected]>

Author: kawasaki

check

@@ -417,7 +417,7 @@ _cleanup() {
 	_exit_cgroup2
 }
 
-__call_test() {
+_call_test() {
 	local test_func="$1"
 	local seqres="${RESULTS_DIR}/${TEST_NAME}"
 	# shellcheck disable=SC2034
@@ -537,17 +537,6 @@ __call_test() {
 	fi
 }
 
-_call_test() {
-	local ret
-
-	__call_test "$@"
-	ret=$?
-
-	_unload_modules
-
-	return $ret
-}
-
 _test_dev_is_zoned() {
 	[[ -e "${TEST_DEV_SYSFS}/queue/zoned" &&
 	   $(cat "${TEST_DEV_SYSFS}/queue/zoned") != none ]]
@@ -711,6 +700,7 @@ _check_and_call_test() {
 	[[ -n $COND_DESC ]] && postfix=_${COND_DESC//[ =]/_}
 	RESULTS_DIR="$OUTPUT/nodev${postfix}"
 	_call_test test
+	_unload_modules
 }
 
 _check_and_call_test_device() {
@@ -771,6 +761,8 @@ _check_and_call_test_device() {
 			unset "TEST_DEV_PART_SYSFS_DIRS[${TEST_DEV}]"
 			TEST_DEVS=()
 		fi
+
+		_unload_modules
 	done
 
 	return $ret
@@ -842,6 +834,7 @@ _check_and_call_test_device_array() {
 		unset "TEST_DEV_ARRAY_SYSFS_DIRS[${devs[i]}]"
 	done
 
+	_unload_modules
 	return $ret
 }