From 28cb7456320273ea47a890f98c91b70585246c98 Mon Sep 17 00:00:00 2001 From: tashda Date: Wed, 6 May 2026 12:22:27 +0200 Subject: [PATCH] Retry flaky Z2MIntegrationTests once on Full CI Pass -retry-tests-on-failure -test-iterations 2 to the unit+integration xcodebuild step. Real regressions still fail twice; one-off WS connect timeouts to the mock bridge (races between back-to-back tests and the bridge replaying ~173 retained messages on each new client) absorb a single retry. Co-Authored-By: Claude Opus 4.7 (1M context) --- .github/workflows/ci-full.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/ci-full.yml b/.github/workflows/ci-full.yml index 33353c4..b254fe1 100644 --- a/.github/workflows/ci-full.yml +++ b/.github/workflows/ci-full.yml @@ -131,6 +131,12 @@ jobs: # (keychain/concurrency issues that only fail on GitHub runners) — # except Z2MIntegrationTests, which Full CI explicitly runs because # we now have the mock bridge up. See xctestplans/README.md. + # Z2MIntegrationTests talks to the live mock bridge over a real + # WebSocket. On GitHub's shared runners, back-to-back tests + # occasionally race the previous client's teardown against the + # bridge replaying ~173 retained messages, causing a connect + # timeout. Retry once per test on failure to absorb that flake + # without masking real regressions — a true bug will fail twice. set -o pipefail xcodebuild test-without-building \ -project Shellbee.xcodeproj -scheme "$SCHEME" \ @@ -143,6 +149,7 @@ jobs: -skip-testing:"ShellbeeTests/NotificationPreferencesTests" \ -skip-testing:"ShellbeeTests/ConnectionConfigTests/testSecondLoadAfterLegacyMigrationStillReturnsToken" \ -skip-testing:"ShellbeeTests/Z2MIntegrationTests/testReloadedPersistedConfigConnectsAndReceivesBridgeInfo" \ + -retry-tests-on-failure -test-iterations 2 \ -resultBundlePath "$DERIVED_DATA/UnitTests.xcresult" \ CODE_SIGNING_ALLOWED=NO | tee test-unit.log