Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Shorten server test HTTP fixture teardown (#5630)

Nick Gomez48d794e6724e
diff --git a/packages/server/src/api-asset.test.ts b/packages/server/src/api-asset.test.ts
index 134549200..ba5d6329e 100644
--- a/packages/server/src/api-asset.test.ts
+++ b/packages/server/src/api-asset.test.ts
@@ -6,6 +6,7 @@ import { join } from 'node:path';
import { afterEach, beforeEach, describe, expect, test } from 'vitest';
import { createApiExtension } from './api-extension.test-helper.ts';
import type { ContentFilter } from './content-filter.ts';
+import { closeTestHttpServer } from './http-server.test-helper.ts';
import { listenOnLoopback } from './loopback-rig-test-helpers.ts';
interface Harness {
@@ -35,10 +36,7 @@ async function startHarness(contentDir: string, contentFilter?: ContentFilter):
return {
baseURL: baseUrl,
- close: () =>
- new Promise<void>((resolve, reject) => {
- server.close((err) => (err ? reject(err) : resolve()));
- }),
+ close: () => closeTestHttpServer(server),
};
}
diff --git a/packages/server/src/asset-serve-middleware.integration.test.ts b/packages/server/src/asset-serve-middleware.integration.test.ts
index a52fab9f5..b7b7484ef 100644
--- a/packages/server/src/asset-serve-middleware.integration.test.ts
+++ b/packages/server/src/asset-serve-middleware.integration.test.ts
@@ -11,6 +11,7 @@ import sirv from 'sirv';
import { afterEach, beforeEach, describe, expect, test } from 'vitest';
import { createAssetServeMiddleware } from './asset-serve-middleware.ts';
import { createContentFilter } from './content-filter.ts';
+import { closeTestHttpServer } from './http-server.test-helper.ts';
import { buildIngressPolicy } from './ingress-policy.ts';
import { listenOnLoopback } from './loopback-rig-test-helpers.ts';
@@ -46,10 +47,7 @@ async function startHarness(contentDir: string): Promise<Harness> {
return {
baseURL,
- close: () =>
- new Promise<void>((resolve, reject) => {
- server.close((err) => (err ? reject(err) : resolve()));
- }),
+ close: () => closeTestHttpServer(server),
};
}
diff --git a/packages/server/src/http-server-teardown.test.ts b/packages/server/src/http-server-teardown.test.ts
new file mode 100644
index 000000000..6f677ea85
--- /dev/null
+++ b/packages/server/src/http-server-teardown.test.ts
@@ -0,0 +1,37 @@
+import { once } from 'node:events';
+import { createServer } from 'node:http';
+import { createConnection, type Socket } from 'node:net';
+import { expect, test } from 'vitest';
+import { closeTestHttpServer } from './http-server.test-helper.ts';
+import { listenOnLoopback } from './loopback-rig-test-helpers.ts';
+
+test('HTTP fixture teardown releases an active response connection', async () => {
+ const server = createServer((_request, response) => {
+ response.write('pending response');
+ });
+ const accepted = new Promise<Socket>((resolve) => server.once('connection', resolve));
+ const { port } = await listenOnLoopback(server);
+ const client = createConnection({ host: '127.0.0.1', port });
+ let shutdown: Promise<void> | undefined;
+ try {
+ const received = once(client, 'data');
+ client.write('GET / HTTP/1.1\r\nHost: 127.0.0.1\r\nConnection: keep-alive\r\n\r\n');
+ const connection = await accepted;
+ await received;
+ expect(connection.destroyed).toBe(false);
+
+ shutdown = closeTestHttpServer(server);
+ expect(connection.destroyed).toBe(true);
+ await shutdown;
+ expect(server.listening).toBe(false);
+ } finally {
+ client.destroy();
+ server.closeAllConnections();
+ if (server.listening) {
+ await new Promise<void>((resolve, reject) => {
+ server.close((error) => (error ? reject(error) : resolve()));
+ });
+ }
+ await shutdown;
+ }
+});
diff --git a/packages/server/src/http-server.test-helper.ts b/packages/server/src/http-server.test-helper.ts
new file mode 100644
index 000000000..947ceeed9
--- /dev/null
+++ b/packages/server/src/http-server.test-helper.ts
@@ -0,0 +1,8 @@
+import type { Server } from 'node:http';
+
+export function closeTestHttpServer(server: Server): Promise<void> {
+ return new Promise<void>((resolve, reject) => {
+ server.close((error) => (error ? reject(error) : resolve()));
+ server.closeAllConnections();
+ });
+}