test: lib: print if wait_until failed

Signed-off-by: fanzu8 <tuzengbing@gmail.com>

Author: fanzu8

e2e/lib.sh

@@ -75,11 +75,14 @@ assert_kubelet_pod_count() {
 		assert_eq "$actual" "$expect" "$desc"
 	}
 
-	wait_until \
+	if ! wait_until \
 		"$((WAIT_HUATUO_BAMAI_TIMEOUT / 2))" \
 		"${WAIT_HUATUO_BAMAI_INTERVAL}" \
 		"$desc" \
-		_assert
+		_assert; then
+		# wait timeout, dump pods from kubelet
+		kubelet_pods_json
+	fi
 }
 
 assert_huatuo_bamai_pod_count() {
@@ -90,11 +93,14 @@ assert_huatuo_bamai_pod_count() {
 		assert_eq "$actual" "$expect" "$desc"
 	}
 
-	wait_until \
+	if ! wait_until \
 		"$((WAIT_HUATUO_BAMAI_TIMEOUT / 2))" \
 		"${WAIT_HUATUO_BAMAI_INTERVAL}" \
 		"$desc" \
-		_assert
+		_assert; then
+		# wait timeout, dump pods from huatuo-bamai
+		curl "${CURL_TIMEOUT[@]}" ${HUATUO_BAMAI_PODS_API}
+	fi
 }
 
 e2e_test_teardown() {

integration/lib.sh

@@ -51,30 +51,36 @@ assert_eq() {
 }
 
 # wait_until <timeout> <interval> <description> <function> [args...]
-# Example:
-# wait_until 10 1 "check ready" my_check_func "arg1" "arg2"
+# Returns: 0 on success, 1 on timeout (does not exit script)
 wait_until() {
 	local timeout=$1 interval=$2 desc=$3
 	shift 3
 	local func=$1
 	shift
 
-	if ! declare -f "$func" >/dev/null 2>&1; then
-		fatal "❌ wait_until expects function or command: \"$func\""
+	if ! type -t "$func" >/dev/null 2>&1; then
+		echo "❌ wait_until expects function or command: \"$func\"" >&2
+		return 1
 	fi
 
 	local end=$(($(date +%s) + timeout))
 	local attempt=0
-	while (($(date +%s) < end)); do
+	local ret=0
+
+	while [ "$(date +%s)" -lt "$end" ]; do
+		ret=0
 		attempt=$((attempt + 1))
-		log_info "wait attempt #${attempt}: ${desc}"
-		if "$func" "$@"; then
+		log_info "wait attempt #${attempt}: ${desc}, func/cmd: [${func} ${@}]"
+		"$func" "$@" || ret=$?
+		if [ "$ret" -eq 0 ]; then
 			return 0
 		fi
+
 		sleep "$interval"
 	done
 
-	fatal "❌ timeout waiting for: ${desc} after ${timeout}s"
+	log_error "❌ wait_until timeout: ${desc}, func/cmd: [${func} ${@}]"
+	return 1
 }
 
 # ------------------------------- huatuo-bamai --------------------------------
@@ -88,6 +94,8 @@ huatuo_bamai_start() {
 	${HUATUO_BAMAI_BIN} "${args[@]}" >${HUATUO_BAMAI_TEST_TMPDIR}/huatuo.log 2>&1 &
 	HUATUO_BAMAI_PID=$!
 
+	sleep 0.5s
+
 	wait_until "${WAIT_HUATUO_BAMAI_TIMEOUT}" "${WAIT_HUATUO_BAMAI_INTERVAL}" "huatuo-bamai ready" \
 		huatuo_bamai_ready
 }