Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion browser_tests/fixtures/utils/statusRetryRoutes.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import type { ErrorResponse } from '@comfyorg/ingest-types'
import type { Page, Request, Route } from '@playwright/test'

export const CAPABILITIES_ROUTE = '**/api/billing/capabilities'
const CAPABILITIES_PATH = '/api/billing/capabilities'
export const CAPABILITIES_ROUTE = `**${CAPABILITIES_PATH}`
export const STATUS_RETRY_PROBE_ROUTE = '**/api/status-retry-probe'

const SERVICE_UNAVAILABLE: ErrorResponse = {
Expand All @@ -14,6 +15,16 @@ export function fulfillUnavailable(route: Route): Promise<void> {
return route.fulfill({ status: 503, json: SERVICE_UNAVAILABLE })
}

/** Records every capabilities request whose response has finished downloading. */
export function recordFinishedCapabilityReads(page: Page): Request[] {
const reads: Request[] = []
page.on('requestfinished', (request) => {
if (new URL(request.url()).pathname.endsWith(CAPABILITIES_PATH))

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.

Could this compare the parsed pathname with CAPABILITIES_PATH exactly? endsWith also accepts unrelated paths such as /proxy/api/billing/capabilities, so such a request could satisfy the readiness count before the real billing retries finish. Parsing the URL already preserves query-string support.

reads.push(request)
})
return reads
}

/** Routes GETs on `routeGlob` to 503 for the first `unavailableCount` answers, recording each GET. */
export async function routeUnavailableGets(
page: Page,
Expand Down
7 changes: 2 additions & 5 deletions browser_tests/tests/infrastructure/cloudStatusRetry.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import {
STATUS_RETRY_PROBE_ROUTE,
fetchThroughApp,
fulfillUnavailable,
recordFinishedCapabilityReads,
routeUnavailableGets
} from '@e2e/fixtures/utils/statusRetryRoutes'

Expand Down Expand Up @@ -50,11 +51,7 @@ test.describe('Shared request status retry', { tag: '@cloud' }, () => {
CAPABILITIES_ROUTE,
Number.POSITIVE_INFINITY
)
const finishedReads: Request[] = []
page.on('requestfinished', (request) => {
if (request.url().endsWith('/api/billing/capabilities'))
finishedReads.push(request)
})
const finishedReads = recordFinishedCapabilityReads(page)

const content = await workspace.openPlanAndCreditsSettings()

Expand Down
Loading