From d9e406ca99c95e8bb4a0bb1e504b0e1b5a4b316b Mon Sep 17 00:00:00 2001
From: Viktor Scharf <v.scharf@opencloud.eu>
Date: Tue, 28 Jul 2026 13:44:28 +0200
Subject: [PATCH] rerun flaky tests (#3183)

---
 .../enableDisableShareSync.feature            |   2 +-
 tests/acceptance/scripts/run.sh               | 110 ++++++++++++++++++
 2 files changed, 111 insertions(+), 1 deletion(-)

diff --git a/tests/acceptance/features/apiSharingNg1/enableDisableShareSync.feature b/tests/acceptance/features/apiSharingNg1/enableDisableShareSync.feature
index e88d27d048..52c475a128 100644
--- a/tests/acceptance/features/apiSharingNg1/enableDisableShareSync.feature
+++ b/tests/acceptance/features/apiSharingNg1/enableDisableShareSync.feature
@@ -418,7 +418,7 @@ Feature:  enable or disable sync of incoming shares
       }
       """
 
-
+  @flaky @issue-1878
   Scenario: try to enable sync of shared resource from Personal Space when sharer is deleted
     Given user "Brian" has disabled the auto-sync share
     And user "Alice" has uploaded file with content "hello world" to "/textfile0.txt"
diff --git a/tests/acceptance/scripts/run.sh b/tests/acceptance/scripts/run.sh
index a352f9c68b..5f3a401f46 100755
--- a/tests/acceptance/scripts/run.sh
+++ b/tests/acceptance/scripts/run.sh
@@ -191,6 +191,12 @@ then
 	BEHAT_RERUN_TIMES=1
 fi
 
+# rerun a failed scenario that is tagged @flaky.
+if [ -z "${BEHAT_FLAKY_RERUN_TIMES}" ]
+then
+	BEHAT_FLAKY_RERUN_TIMES=1
+fi
+
 # expected variables
 # --------------------
 # $SUITE_FEATURE_TEXT - human readable which test to run
@@ -211,6 +217,7 @@ fi
 declare -a UNEXPECTED_FAILED_SCENARIOS
 declare -a UNEXPECTED_PASSED_SCENARIOS
 declare -a UNEXPECTED_BEHAT_EXIT_STATUSES
+declare -a ALL_FAILED_SCENARIO_PATHS
 
 function run_behat_tests() {
 	echo "Running ${SUITE_FEATURE_TEXT} tests tagged ${BEHAT_FILTER_TAGS}" | tee ${TEST_LOG_FILE}
@@ -297,6 +304,11 @@ function run_behat_tests() {
 	if [ -z "${FAILED_SCENARIO_PATHS}" ]
 	then
 		unset FAILED_SCENARIO_PATHS
+	else
+		for FAILED_SCENARIO_PATH in ${FAILED_SCENARIO_PATHS}
+		do
+			ALL_FAILED_SCENARIO_PATHS+=("${FAILED_SCENARIO_PATH}")
+		done
 	fi
 
 	if [ -n "${EXPECTED_FAILURES_FILE}" ]
@@ -403,6 +415,101 @@ function run_behat_tests() {
 	fi
 }
 
+# Retry scenarios that failed but are tagged @flaky.
+function rerun_failed_flaky_scenarios() {
+	if [ ${BEHAT_FLAKY_RERUN_TIMES} -lt 1 ]
+	then
+		return
+	fi
+
+	if [ ${#UNEXPECTED_FAILED_SCENARIOS[@]} -eq 0 ] || [ ${#ALL_FAILED_SCENARIO_PATHS[@]} -eq 0 ]
+	then
+		return
+	fi
+
+	# suite/scenario keys that failed first but passed on a retry
+	local recovered=()
+
+	for FEATURE_PATH in "${ALL_FAILED_SCENARIO_PATHS[@]}"
+	do
+		local suite scenario key
+		suite=$(basename "$(dirname "${FEATURE_PATH}")")
+		scenario=$(basename "${FEATURE_PATH}")
+		key="${suite}/${scenario}"
+
+		local is_unexpected=false
+		for uf in "${UNEXPECTED_FAILED_SCENARIOS[@]}"
+		do
+			if [ "${uf}" = "${key}" ]
+			then
+				is_unexpected=true
+				break
+			fi
+		done
+		if [ "${is_unexpected}" != true ]
+		then
+			continue
+		fi
+
+		local dry_run_file
+		dry_run_file=$(mktemp)
+		${BEHAT} --dry-run --no-colors -c ${BEHAT_YML} -f pretty --tags '@flaky' "${FEATURE_PATH}" 1>${dry_run_file} 2>/dev/null
+		if grep -q -m 1 'No scenarios' "${dry_run_file}"
+		then
+			rm -f "${dry_run_file}"
+			continue
+		fi
+		rm -f "${dry_run_file}"
+
+		log_info "Scenario ${key} is tagged @flaky, retrying up to ${BEHAT_FLAKY_RERUN_TIMES} times"
+
+		local passed=false
+		for attempt in $(seq 1 ${BEHAT_FLAKY_RERUN_TIMES})
+		do
+			echo -e "\nFlaky retry attempt ${attempt} of ${BEHAT_FLAKY_RERUN_TIMES}: ${key}"
+			${BEHAT} ${COLORS_OPTION} --strict -c ${BEHAT_YML} -f pretty --tags '@flaky' "${FEATURE_PATH}" -v 2>&1 | tee -a ${TEST_LOG_FILE}
+			if [ ${PIPESTATUS[0]} -eq 0 ]
+			then
+				passed=true
+				break
+			fi
+		done
+
+		if [ "${passed}" = true ]
+		then
+			log_info "Flaky scenario ${key} passed on retry, not counting it as a failure."
+			recovered+=("${key}")
+		else
+			log_failed "Flaky scenario ${key} still failing after ${BEHAT_FLAKY_RERUN_TIMES} retries."
+		fi
+	done
+
+	if [ ${#recovered[@]} -eq 0 ]
+	then
+		return
+	fi
+
+	# Drop the recovered flaky scenarios from the list of unexpected failures.
+	local remaining=()
+	for uf in "${UNEXPECTED_FAILED_SCENARIOS[@]}"
+	do
+		local drop=false
+		for r in "${recovered[@]}"
+		do
+			if [ "${uf}" = "${r}" ]
+			then
+				drop=true
+				break
+			fi
+		done
+		if [ "${drop}" != true ]
+		then
+			remaining+=("${uf}")
+		fi
+	done
+	UNEXPECTED_FAILED_SCENARIOS=("${remaining[@]}")
+}
+
 declare -x TEST_SERVER_URL
 
 if [ -z "${IPV4_URL}" ]
@@ -590,6 +697,9 @@ for i in "${!BEHAT_SUITES[@]}"
 			done
 done
 
+# Give scenarios tagged @flaky another chance before treating them as failures.
+rerun_failed_flaky_scenarios
+
 # 3 types of things can have gone wrong:
 #   - some scenario failed (and it was not expected to fail)
 #   - some scenario passed (but it was expected to fail)