Skip to content

Commit ad5ef0e

Browse files
committed
Abort pending nock requests to prevent flakes.
1 parent 0823489 commit ad5ef0e

File tree

1 file changed

+11
-3
lines changed
  • packages/node-integration-tests/utils

1 file changed

+11
-3
lines changed

packages/node-integration-tests/utils/index.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -255,9 +255,17 @@ export class TestEnv {
255255
// Ex: Remix scope bleed tests.
256256
nock.cleanAll();
257257

258-
void this._closeServer().then(() => {
259-
resolve(envelopes);
260-
});
258+
// Abort all pending requests to nock to prevent hanging / flakes.
259+
// See: https://github.com/nock/nock/issues/1118#issuecomment-544126948
260+
nock.abortPendingRequests();
261+
262+
this._closeServer()
263+
.catch(e => {
264+
logger.warn(e);
265+
})
266+
.finally(() => {
267+
resolve(envelopes);
268+
});
261269
} else {
262270
resolve(envelopes);
263271
}

0 commit comments

Comments
 (0)