Skip to content

chore(runway): cherry-pick test: improves websocket server teardown#30118

Merged
chloeYue merged 4 commits into
release/7.77.0from
cherry-pick-7-77-0-fef5dc4
May 13, 2026
Merged

chore(runway): cherry-pick test: improves websocket server teardown#30118
chloeYue merged 4 commits into
release/7.77.0from
cherry-pick-7-77-0-fef5dc4

Conversation

@runway-github

@runway-github runway-github Bot commented May 13, 2026

Copy link
Copy Markdown
Contributor

Description

This PR improves websocket server teardown to prevent port collision and
skips failing tests.
Context:
https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169

Changelog

CHANGELOG entry: null

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

Performance checks (if applicable)

  • I've tested on Android
    • Ideally on a mid-range device; emulator is acceptable
  • I've tested with a power user scenario
  • Use these power-user
    SRPs

    to import wallets with many accounts and tokens
  • I've instrumented key operations with Sentry traces for production
    performance metrics
  • See trace() for usage and
    addToken
    for an example

For performance guidelines and tooling, see the Performance
Guide
.

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.

Note

Low Risk
Low risk: changes are limited to the E2E test harness and smoke specs,
mainly improving WebSocket teardown/port release to avoid CI port
collisions. Main downside is reduced coverage due to multiple smoke
suites being temporarily skipped.

Overview
Improves E2E WebSocket teardown to avoid port collisions.
LocalWebSocketServer now optionally tracks a ResourceType and always
releases its PortManager allocation when stopping (including when the
server was never started, and via a finally to guarantee cleanup on
errors). withFixtures now constructs the account-activity WebSocket
server with ResourceType.ACCOUNT_ACTIVITY_WS so this release happens.

Unblocks CI by skipping failing smoke tests. Several smoke specs
(native send, EIP-7702 gas fee token flows, perps liquidation, and snap
tests) are switched to describe.skip with comments pointing to the
tracking thread.

Reviewed by Cursor Bugbot for commit
54caed9. Bugbot is set up for automated
code reviews on this repo. Configure
here.

[fef5dc4](https://github.com/MetaMask/metamask-mobile/commit/fef5dc4299ea909a70315f33c2871f97a672bb68)

<!--
Please submit this PR as a draft initially.

Do not mark it as "Ready for review" until this PR meets the canonical
Definition of Ready For Review in `docs/readme/ready-for-review.md`.

In short: the template must be materially complete (not just section
titles
present), all status checks must be currently passing, and the only
expected
follow-up commits must be reviewer-driven.
-->

This PR improves websocket server teardown to prevent port collision and
skips failing tests.
Context:
https://consensys.slack.com/archives/C02U025CVU4/p1778589879443169

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry:

Fixes:

```gherkin
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]
```

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

<!-- [screenshots/recordings] -->

<!--
Every checklist item must be consciously assessed before marking this PR
as
"Ready for review". A checked box means you deliberately considered that
responsibility, not that you literally performed every action listed.

Unchecked boxes are ambiguous: they are not an implicit "N/A" and they
are not
a silent "skip". See `docs/readme/ready-for-review.md` for the full
checklist
semantics.
-->

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] 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](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] I've tested on Android
  - Ideally on a mid-range device; emulator is acceptable
- [ ] I've tested with a power user scenario
- Use these [power-user
SRPs](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/edit-v2/401401446401?draftShareId=9d77e1e1-4bdc-4be1-9ebb-ccd916988d93)
to import wallets with many accounts and tokens
- [ ] I've instrumented key operations with Sentry traces for production
performance metrics
- See [`trace()`](/app/util/trace.ts) for usage and
[`addToken`](/app/components/Views/AddAsset/components/AddCustomToken/AddCustomToken.tsx#L274)
for an example

For performance guidelines and tooling, see the [Performance
Guide](https://consensyssoftware.atlassian.net/wiki/spaces/TL1/pages/400085549067/Performance+Guide+for+Engineers).

<!--
Reviewer checklist items follow the same semantics as the author
checklist: an
unchecked box is ambiguous, a checked box means the reviewer consciously
assessed that responsibility. See `docs/readme/ready-for-review.md`.
-->

- [ ] 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.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Low Risk**
> Low risk: changes are limited to the E2E test harness and smoke specs,
mainly improving WebSocket teardown/port release to avoid CI port
collisions. Main downside is reduced coverage due to multiple smoke
suites being temporarily skipped.
>
> **Overview**
> **Improves E2E WebSocket teardown to avoid port collisions.**
`LocalWebSocketServer` now optionally tracks a `ResourceType` and always
releases its `PortManager` allocation when stopping (including when the
server was never started, and via a `finally` to guarantee cleanup on
errors). `withFixtures` now constructs the account-activity WebSocket
server with `ResourceType.ACCOUNT_ACTIVITY_WS` so this release happens.
>
> **Unblocks CI by skipping failing smoke tests.** Several smoke specs
(native send, EIP-7702 gas fee token flows, perps liquidation, and snap
tests) are switched to `describe.skip` with comments pointing to the
tracking thread.
>
> <sup>Reviewed by [Cursor Bugbot](https://cursor.com/bugbot) for commit
54caed9. Bugbot is set up for automated
code reviews on this repo. Configure
[here](https://www.cursor.com/dashboard/bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
@runway-github runway-github Bot requested review from a team as code owners May 13, 2026 14:43
@github-actions

Copy link
Copy Markdown
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@chloeYue chloeYue added the team-bots Bot team (for MetaMask Bot, Runway Bot, etc.) label May 13, 2026

@chloeYue chloeYue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@github-actions

Copy link
Copy Markdown
Contributor

🔍 Smart E2E Test Selection

⏭️ Smart E2E selection skipped - PR targets a release branch (release/*)

All E2E tests pre-selected.

View GitHub Actions results

@codecov-commenter

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
⚠️ Please upload report for BASE (release/7.77.0@63c5a54). Learn more about missing BASE report.

Additional details and impacted files
@@                Coverage Diff                @@
##             release/7.77.0   #30118   +/-   ##
=================================================
  Coverage                  ?   81.54%           
=================================================
  Files                     ?     5331           
  Lines                     ?   141512           
  Branches                  ?    32254           
=================================================
  Hits                      ?   115394           
  Misses                    ?    18229           
  Partials                  ?     7889           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@sonarqubecloud

Copy link
Copy Markdown

@chloeYue chloeYue left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@chloeYue chloeYue merged commit df62f82 into release/7.77.0 May 13, 2026
102 of 104 checks passed
@chloeYue chloeYue deleted the cherry-pick-7-77-0-fef5dc4 branch May 13, 2026 20:07
@github-actions github-actions Bot locked and limited conversation to collaborators May 13, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

size-S team-bots Bot team (for MetaMask Bot, Runway Bot, etc.)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants