File tree Expand file tree Collapse file tree
dev-packages/cloudflare-integration-tests Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -256,16 +256,22 @@ export function createRunner(...paths: string[]) {
256256 return ;
257257 }
258258
259- // Check per-request waiters first (FIFO order)
259+ // Resolve per-request waiters first, matching in any order so a request
260+ // expecting multiple envelopes isn't sensitive to their arrival order.
260261 if ( envelopeWaiters . length > 0 ) {
261- const waiter = envelopeWaiters . shift ( ) ! ;
262- try {
263- assertEnvelopeMatches ( waiter . expected , envelope ) ;
264- waiter . resolve ( ) ;
265- } catch ( e ) {
266- waiter . reject ( e ) ;
262+ const waiterIndex = envelopeWaiters . findIndex ( waiter => {
263+ try {
264+ assertEnvelopeMatches ( waiter . expected , envelope ) ;
265+ return true ;
266+ } catch {
267+ return false ;
268+ }
269+ } ) ;
270+
271+ if ( waiterIndex >= 0 ) {
272+ envelopeWaiters . splice ( waiterIndex , 1 ) [ 0 ] ! . resolve ( ) ;
273+ return ;
267274 }
268- return ;
269275 }
270276
271277 try {
You can’t perform that action at this time.
0 commit comments