Description

Fixes two recurring CI failures affecting Android and iOS E2E smoke suites.

Fix 1: Mockttp Aborted errors failing tests after filter removal

Root cause: CI logs showed abort events firing ~180ms after removeAbortFilter() was called and Jest's original handlers
were restored:

17:47:54.898 Abort filter removed — suppressed 0 mockttp "Aborted" error(s)
17:47:55.082 Aborted at IncomingMessage.failWithAbortError ← 184ms later

The existing 500ms drain inside stop() did not help because it runs before removeAbortFilter(). On loaded CI runners (4 CPUs
at 100%), the Node.js event loop delays abort events from destroyed sockets beyond the drain window. By the time
removeAbortFilter() restored Jest's handlers, the queued events fired straight into Jest as test failures.

Fix: removeAbortFilter() is now async and waits 500ms before restoring Jest's handlers (MockServerE2E.ts).
withFixtures now awaits the call (FixtureHelper.ts). Abort events observed at up to ~200ms fire during the 500ms hold window
and are suppressed by the still-active filter.

Fix 2: Android adb: device 'emulator-XXXX' not found crashing tests

Root cause: On CI, emulators occasionally go offline between tests (still booting, brief crash-recovery).
setupAndroidPortForwarding had no retry logic — any adb reverse failure was immediately rethrown, propagating through
startResourceWithRetry → handleLocalNodes → withFixtures and killing the test before it started.

Failed to set up Android port forwarding for anvil:
adb: device 'emulator-10342' not found
Failed to start anvil after 0 attempts
Error in withFixtures: Command failed: adb -s emulator-10342 reverse tcp:8545 tcp:55324

Fix: setupAndroidPortForwarding now retries up to 3 times (2s apart) when the error indicates the device is transiently
unreachable (not found, device offline, unauthorized). Persistent failures still fail the test after exhausting retries.

Files changed

Changelog

CHANGELOG entry:

Related issues

Fixes:

Manual testing steps

Feature: my feature name

  Scenario: user [verb for user action]
    Given [describe expected initial app state]

    When user [verb for user action]
    Then [describe expected outcome]

Screenshots/Recordings

Before

After

Pre-merge author checklist

• I've followed MetaMask Contributor Docs and MetaMask Mobile Coding Standards.
• I've completed the PR template to the best of my ability
• I've included tests if applicable
• I've documented my code using JSDoc format if applicable
• I've applied the right labels on the PR (see labeling guidelines). Not required for external contributors.

Pre-merge reviewer checklist

• I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
• I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.