fix: test retry

Author: kacperzolkiewski

.maestro/enrichedInput/flows/scrolling_with_paragraph_styles.yaml

@@ -98,7 +98,10 @@ appId: swmansion.enriched.example
     id: 'editor-input'
     point: '0%,0%'
 
-- scroll
+- swipe:
+    from:
+      id: 'editor-input'
+    direction: UP
 
 - waitForAnimationToEnd
 

.maestro/scripts/run-tests.sh

@@ -21,9 +21,9 @@
 #   Android → --driver devicelab
 #   iOS     → default driver
 #
-# Failed test runs are retried in CI only (iOS and Android). Override with
-# MAESTRO_MAX_RETRIES (default: 1 locally, 2 in CI). DeviceLab driver startup
-# crashes on CI Android get extra cleanup between attempts.
+# In CI, failed flows are retried individually (not the whole suite). Override
+# with MAESTRO_MAX_RETRIES (default: 1 locally, 2 in CI). DeviceLab driver
+# startup crashes on CI Android get extra cleanup between attempts.
 
 set -euo pipefail
 
@@ -167,7 +167,29 @@ cleanup_devicelab_driver() {
   sleep 8
 }
 
-run_maestro() {
+collect_flow_files() {
+  local item
+  for item in $FLOWS; do
+    [ "$item" = "$ASSETS_DIR" ] && continue
+    if [ -d "$item" ]; then
+      find "$item" -name '*.yaml' | sort
+    elif [ -f "$item" ]; then
+      echo "$item"
+    fi
+  done
+}
+
+maestro_test_paths() {
+  local flow="$1"
+  local paths=""
+  [ -d "$ASSETS_DIR" ] && paths="$ASSETS_DIR "
+  paths+="$flow"
+  echo "$paths"
+}
+
+run_maestro_with_targets() {
+  local test_targets="$1"
+  shift
   local max_attempts rc tmp attempt=1 delayed_retry=0
   if [ -n "${MAESTRO_MAX_RETRIES:-}" ]; then
     max_attempts="$MAESTRO_MAX_RETRIES"
@@ -184,11 +206,11 @@ run_maestro() {
     # Global flags (--device, --driver, --env, tags) come before `test`.
     if [[ "$OSTYPE" == darwin* ]]; then
       # shellcheck disable=SC2086
-      script -q /dev/null "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $FLOWS 2>&1 | tee "$tmp"
+      script -q /dev/null "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $test_targets 2>&1 | tee "$tmp"
     else
       local cmd
       # shellcheck disable=SC2086
-      cmd=$(printf '%q ' "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $FLOWS)
+      cmd=$(printf '%q ' "$MAESTRO_BIN" --platform "$PLATFORM" --device "$DEVICE_ID" $DRIVER_ARGS $EXTRA "$@" test $test_targets)
       script -qec "$cmd" /dev/null 2>&1 | tee "$tmp"
     fi
     rc=${PIPESTATUS[0]}
@@ -236,6 +258,20 @@ run_maestro() {
   done
 }
 
+run_maestro() {
+  if is_ci; then
+    local flow failed=0
+    while IFS= read -r flow; do
+      [ -z "$flow" ] && continue
+      echo "=== Running flow: $flow ==="
+      run_maestro_with_targets "$(maestro_test_paths "$flow")" "$@" || failed=1
+    done < <(collect_flow_files)
+    return "$failed"
+  fi
+
+  run_maestro_with_targets "$FLOWS" "$@"
+}
+
 set +e
 
 echo "=== Running maestro tests ==="