test test

Author: BartoszBlizniak

scripts/run-acc-tests.sh

@@ -5,8 +5,8 @@
 # Environment variables (override as needed):
 #   PARALLEL           Go test -parallel value (default 6)
 #   TIMEOUT            Per test package timeout (default 30m)
-#   RERUN_MAX_TIMES    How many times to re-run a failing test (default 2)
-#   RERUN_FAILS        Max number of distinct failing tests eligible for rerun (default 50)
+#   RERUN_MAX_TIMES    How many *additional* times to re-run failing tests (default 2). Maps to gotestsum --rerun-fails (attempts = value)
+#   RERUN_MAX_FAILURES Maximum number of initial failures to allow before giving up on reruns (default 50). Maps to gotestsum --rerun-fails-max-failures
 #   EXTRA_ARGS         Extra args to pass through to `go test` after the rerun flags
 #   TF_ACC             Forced to 1 if unset (enables acceptance tests)
 #
@@ -21,7 +21,7 @@ set -euo pipefail
 PARALLEL=${PARALLEL:-6}
 TIMEOUT=${TIMEOUT:-30m}
 RERUN_MAX_TIMES=${RERUN_MAX_TIMES:-2}
-RERUN_FAILS=${RERUN_FAILS:-50}
+RERUN_MAX_FAILURES=${RERUN_MAX_FAILURES:-50}
 EXTRA_ARGS=${EXTRA_ARGS:-}
 
 export TF_ACC=${TF_ACC:-1}
@@ -30,18 +30,33 @@ if ! command -v gotestsum >/dev/null 2>&1; then
   echo "[INFO] Installing gotestsum (not found in PATH)" >&2
   # Pin a version for reproducibility; update periodically.
   go install gotest.tools/gotestsum@v1.12.0
+  # After installation, ensure GOPATH/bin (or GOBIN) is on PATH for this script execution.
+  GOBIN_DIR=$(go env GOBIN 2>/dev/null || true)
+  GOPATH_DIR=$(go env GOPATH 2>/dev/null || true)
+  if [ -n "$GOBIN_DIR" ] && [ -d "$GOBIN_DIR" ]; then
+    PATH="$GOBIN_DIR:$PATH"
+  elif [ -n "$GOPATH_DIR" ] && [ -d "$GOPATH_DIR/bin" ]; then
+    PATH="$GOPATH_DIR/bin:$PATH"
+  fi
+fi
+
+# Final defensive check
+if ! command -v gotestsum >/dev/null 2>&1; then
+  echo "[ERROR] gotestsum still not found after installation. PATH=$PATH" >&2
+  echo "       You may need to export GOBIN or GOPATH before running this script." >&2
+  exit 2
 fi
 
 echo "[INFO] Running acceptance tests with selective reruns"
-echo "       parallel=${PARALLEL} timeout=${TIMEOUT} rerun_max_times=${RERUN_MAX_TIMES} rerun_fails=${RERUN_FAILS}" \
-     " extra_args='${EXTRA_ARGS}'"
+echo "       parallel=${PARALLEL} timeout=${TIMEOUT} rerun_max_times=${RERUN_MAX_TIMES} rerun_max_failures=${RERUN_MAX_FAILURES}" \
+  " extra_args='${EXTRA_ARGS}'"
 
 # We disable test caching (-count=1) to ensure fresh runs against live APIs.
 set +e
 gotestsum --format=short-verbose \
   --junitfile test-report.xml \
-  --rerun-fails="${RERUN_FAILS}" \
-  --rerun-fails-max-times="${RERUN_MAX_TIMES}" \
+  --rerun-fails="${RERUN_MAX_TIMES}" \
+  --rerun-fails-max-failures="${RERUN_MAX_FAILURES}" \
   --packages="./..." \
   -- -count=1 -parallel="${PARALLEL}" -timeout="${TIMEOUT}" ${EXTRA_ARGS}
 status=$?