From 8ab3160306716c5c5296eca5207973eb48980a25 Mon Sep 17 00:00:00 2001
From: "russell@unturf.com" <russell@unturf.com>
Date: Thu, 29 Jan 2026 11:53:52 -0500
Subject: [PATCH] fix(tests): faster retries, unique service names, bash local
 fix

- Remove 'local' outside function (line 442)
- Reduce max retry from 10 to 5 for service_create
- Cap backoff at 10s instead of 60s (both run_test and service_create)
- Generate unique service name per attempt (fixes 409 conflicts)
- Handle HTTP 409 as retriable error
---
 scripts/test-sdk.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/test-sdk.sh b/scripts/test-sdk.sh
index 970aa63..b6f7ded 100755
--- a/scripts/test-sdk.sh
+++ b/scripts/test-sdk.sh
@@ -291,10 +291,10 @@ run_test() {
             if [ $attempt -lt $max_retries ]; then
                 echo -n "($error_type retry $attempt/$max_retries)... "
                 sleep $retry_delay
-                # Exponential backoff, cap at 60 seconds
+                # Exponential backoff, cap at 10 seconds
                 retry_delay=$((retry_delay * 2))
-                if [ $retry_delay -gt 60 ]; then
-                    retry_delay=60
+                if [ $retry_delay -gt 10 ]; then
+                    retry_delay=10
                 fi
                 continue
             fi
@@ -419,16 +419,17 @@ run_test "service_list" \
 
 # Test 4.2: Create a service with retry logic (note: syntax is --name not --create)
 # SCIENTIFIC INTEGRITY: Retry on transient errors, fail if we can't create
-SERVICE_NAME="test-$LANG-$$"
 SERVICE_ID=""
 service_attempt=0
-service_max_retries=10
+service_max_retries=5
 service_retry_delay=2
 
 echo -n "Test: service_create... "
 TOTAL_TESTS=$((TOTAL_TESTS + 1))
 
 while [ $service_attempt -lt $service_max_retries ]; do
+    # Generate unique name per attempt (avoids 409 conflicts on retry)
+    SERVICE_NAME="test-$LANG-$$-$(date +%s)"
     SERVICE_OUTPUT=$(build/un service --name "$SERVICE_NAME" --bootstrap "echo service-started" 2>&1 || true)
     echo "$SERVICE_OUTPUT" > "$RESULTS_DIR/service_create.txt"
     SERVICE_ID=$(echo "$SERVICE_OUTPUT" | grep -oE "unsb-service-[a-z0-9-]+" | head -1 || true)
@@ -439,10 +440,12 @@ while [ $service_attempt -lt $service_max_retries ]; do
 
     # Check for transient errors that should trigger retry
     # Track error type for API health monitoring
-    local svc_error_type=""
+    svc_error_type=""
     if grep -qiE "HTTP 429|concurrency_limit|rate.limit" "$RESULTS_DIR/service_create.txt" 2>/dev/null; then
         svc_error_type="429"
         RETRIES_429=$((RETRIES_429 + 1))
+    elif grep -qiE "HTTP 409|already taken|already exists" "$RESULTS_DIR/service_create.txt" 2>/dev/null; then
+        svc_error_type="409"
     elif grep -qiE "HTTP 5[0-9][0-9]|server error|internal error" "$RESULTS_DIR/service_create.txt" 2>/dev/null; then
         svc_error_type="5xx"
         RETRIES_5XX=$((RETRIES_5XX + 1))
@@ -461,8 +464,8 @@ while [ $service_attempt -lt $service_max_retries ]; do
             echo -n "($svc_error_type retry $service_attempt/$service_max_retries)... "
             sleep $service_retry_delay
             service_retry_delay=$((service_retry_delay * 2))
-            if [ $service_retry_delay -gt 60 ]; then
-                service_retry_delay=60
+            if [ $service_retry_delay -gt 10 ]; then
+                service_retry_delay=10
             fi
             continue
         fi