test: use resource disposal to ensure servers shutdown even if tests …

…fail (#11106)
oven-sh · May 17, 2024 · ac6eaac · ac6eaac
1 parent 93abd99
commit ac6eaac
Show file tree

Hide file tree

Showing 33 changed files with 158 additions and 363 deletions.
diff --git a/test/bundler/bundler_compile.test.ts b/test/bundler/bundler_compile.test.ts
@@ -106,7 +106,7 @@ describe("bundler", () => {
         );
 
         const port = 0;
-        const server = Bun.serve({
+        using server = Bun.serve({
           port,
           async fetch(req) {
             return new Response(await renderToReadableStream(<App />), headers);
@@ -115,7 +115,6 @@ describe("bundler", () => {
         const res = await fetch(server.url);
         if (res.status !== 200) throw "status error";
         console.log(await res.text());
-        server.stop(true);
       `,
     },
     run: {

diff --git a/test/bundler/bundler_npm.test.ts b/test/bundler/bundler_npm.test.ts
@@ -1,5 +1,3 @@
-import assert from "assert";
-import dedent from "dedent";
 import { ESBUILD, itBundled, testForFile } from "./expectBundled";
 var { describe, test, expect } = testForFile(import.meta.path);
 
@@ -28,7 +26,7 @@ describe("bundler", () => {
         );
 
         const port = 42001;
-        const server = Bun.serve({
+        using server = Bun.serve({
           port,
           async fetch(req) {
             return new Response(await renderToReadableStream(<App />), headers);
@@ -37,7 +35,6 @@ describe("bundler", () => {
         const res = await fetch("http://localhost:" + port);
         if (res.status !== 200) throw "status error";
         console.log(await res.text());
-        server.stop();
       `,
     },
     run: {

diff --git a/test/cli/install/bun-install-pathname-trailing-slash.test.ts b/test/cli/install/bun-install-pathname-trailing-slash.test.ts
@@ -12,7 +12,7 @@ beforeEach(() => {
 test("custom registry doesn't have multiple trailing slashes in pathname", async () => {
   const urls: string[] = [];
 
-  const server = Bun.serve({
+  using server = Bun.serve({
     port: 0,
     async fetch(req) {
       urls.push(req.url);
@@ -48,7 +48,6 @@ registry = "http://${hostname}:${port}/prefixed-route/"
     stdin: "ignore",
   });
 
-  server.stop(true);
   expect(urls.length).toBe(1);
   expect(urls).toEqual([`http://${hostname}:${port}/prefixed-route/react`]);
 });
diff --git a/test/cli/install/bun-upgrade.test.ts b/test/cli/install/bun-upgrade.test.ts
@@ -15,7 +15,6 @@ beforeEach(async () => {
 });
 
 it("two invalid arguments, should display error message and suggest command", async () => {
-  console.log(run_dir, exe_name);
   const { stderr } = spawn({
     cmd: [join(run_dir, exe_name), "upgrade", "bun-types", "--dev"],
     cwd: run_dir,
@@ -93,7 +92,7 @@ it("two valid argument, should succeed", async () => {
 });
 
 it("zero arguments, should succeed", async () => {
-  const server = Bun.serve({
+  using server = Bun.serve({
     tls: {
       cert: "-----BEGIN CERTIFICATE-----\nMIIDXTCCAkWgAwIBAgIJAKLdQVPy90jjMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTkwMjAzMTQ0OTM1WhcNMjAwMjAzMTQ0OTM1WjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECAwKU29tZS1TdGF0ZTEhMB8GA1UECgwYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEA7i7IIEdICTiSTVx+ma6xHxOtcbd6wGW3nkxlCkJ1UuV8NmY5ovMsGnGD\nhJJtUQ2j5ig5BcJUf3tezqCNW4tKnSOgSISfEAKvpn2BPvaFq3yx2Yjz0ruvcGKp\nDMZBXmB/AAtGyN/UFXzkrcfppmLHJTaBYGG6KnmU43gPkSDy4iw46CJFUOupc51A\nFIz7RsE7mbT1plCM8e75gfqaZSn2k+Wmy+8n1HGyYHhVISRVvPqkS7gVLSVEdTea\nUtKP1Vx/818/HDWk3oIvDVWI9CFH73elNxBkMH5zArSNIBTehdnehyAevjY4RaC/\nkK8rslO3e4EtJ9SnA4swOjCiqAIQEwIDAQABo1AwTjAdBgNVHQ4EFgQUv5rc9Smm\n9c4YnNf3hR49t4rH4yswHwYDVR0jBBgwFoAUv5rc9Smm9c4YnNf3hR49t4rH4ysw\nDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEATcL9CAAXg0u//eYUAlQa\nL+l8yKHS1rsq1sdmx7pvsmfZ2g8ONQGfSF3TkzkI2OOnCBokeqAYuyT8awfdNUtE\nEHOihv4ZzhK2YZVuy0fHX2d4cCFeQpdxno7aN6B37qtsLIRZxkD8PU60Dfu9ea5F\nDDynnD0TUabna6a0iGn77yD8GPhjaJMOz3gMYjQFqsKL252isDVHEDbpVxIzxPmN\nw1+WK8zRNdunAcHikeoKCuAPvlZ83gDQHp07dYdbuZvHwGj0nfxBLc9qt90XsBtC\n4IYR7c/bcLMmKXYf0qoQ4OzngsnPI5M+v9QEHvYWaKVwFY4CTcSNJEwfXw+BAeO5\nOA==\n-----END CERTIFICATE-----",
       key: "-----BEGIN PRIVATE KEY-----\nMIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDuLsggR0gJOJJN\nXH6ZrrEfE61xt3rAZbeeTGUKQnVS5Xw2Zjmi8ywacYOEkm1RDaPmKDkFwlR/e17O\noI1bi0qdI6BIhJ8QAq+mfYE+9oWrfLHZiPPSu69wYqkMxkFeYH8AC0bI39QVfOSt\nx+mmYsclNoFgYboqeZTjeA+RIPLiLDjoIkVQ66lznUAUjPtGwTuZtPWmUIzx7vmB\n+pplKfaT5abL7yfUcbJgeFUhJFW8+qRLuBUtJUR1N5pS0o/VXH/zXz8cNaTegi8N\nVYj0IUfvd6U3EGQwfnMCtI0gFN6F2d6HIB6+NjhFoL+QryuyU7d7gS0n1KcDizA6\nMKKoAhATAgMBAAECggEAd5g/3o1MK20fcP7PhsVDpHIR9faGCVNJto9vcI5cMMqP\n6xS7PgnSDFkRC6EmiLtLn8Z0k2K3YOeGfEP7lorDZVG9KoyE/doLbpK4MfBAwBG1\nj6AHpbmd5tVzQrnNmuDjBBelbDmPWVbD0EqAFI6mphXPMqD/hFJWIz1mu52Kt2s6\n++MkdqLO0ORDNhKmzu6SADQEcJ9Suhcmv8nccMmwCsIQAUrfg3qOyqU4//8QB8ZM\njosO3gMUesihVeuF5XpptFjrAliPgw9uIG0aQkhVbf/17qy0XRi8dkqXj3efxEDp\n1LSqZjBFiqJlFchbz19clwavMF/FhxHpKIhhmkkRSQKBgQD9blaWSg/2AGNhRfpX\nYq+6yKUkUD4jL7pmX1BVca6dXqILWtHl2afWeUorgv2QaK1/MJDH9Gz9Gu58hJb3\nymdeAISwPyHp8euyLIfiXSAi+ibKXkxkl1KQSweBM2oucnLsNne6Iv6QmXPpXtro\nnTMoGQDS7HVRy1on5NQLMPbUBQKBgQDwmN+um8F3CW6ZV1ZljJm7BFAgNyJ7m/5Q\nYUcOO5rFbNsHexStrx/h8jYnpdpIVlxACjh1xIyJ3lOCSAWfBWCS6KpgeO1Y484k\nEYhGjoUsKNQia8UWVt+uWnwjVSDhQjy5/pSH9xyFrUfDg8JnSlhsy0oC0C/PBjxn\nhxmADSLnNwKBgQD2A51USVMTKC9Q50BsgeU6+bmt9aNMPvHAnPf76d5q78l4IlKt\nwMs33QgOExuYirUZSgjRwknmrbUi9QckRbxwOSqVeMOwOWLm1GmYaXRf39u2CTI5\nV9gTMHJ5jnKd4gYDnaA99eiOcBhgS+9PbgKSAyuUlWwR2ciL/4uDzaVeDQKBgDym\nvRSeTRn99bSQMMZuuD5N6wkD/RxeCbEnpKrw2aZVN63eGCtkj0v9LCu4gptjseOu\n7+a4Qplqw3B/SXN5/otqPbEOKv8Shl/PT6RBv06PiFKZClkEU2T3iH27sws2EGru\nw3C3GaiVMxcVewdg1YOvh5vH8ZVlxApxIzuFlDvnAoGAN5w+gukxd5QnP/7hcLDZ\nF+vesAykJX71AuqFXB4Wh/qFY92CSm7ImexWA/L9z461+NKeJwb64Nc53z59oA10\n/3o2OcIe44kddZXQVP6KTZBd7ySVhbtOiK3/pCy+BQRsrC7d71W914DxNWadwZ+a\njtwwKjDzmPwdIXDSQarCx0U=\n-----END PRIVATE KEY-----",
@@ -170,7 +169,6 @@ it("zero arguments, should succeed", async () => {
     },
   });
 
-  server.stop();
   closeTempDirHandle();
 
   // Should not contain error message

diff --git a/test/js/bun/eventsource/eventsource.test.ts b/test/js/bun/eventsource/eventsource.test.ts
@@ -43,7 +43,7 @@
 //   pathname: string,
 //   callback: (evtSource: EventSource, done: (err?: unknown) => void) => void,
 // ) {
-//   const server = Bun.serve({
+//   using server = Bun.serve({
 //     port: 0,
 //     fetch(req) {
 //       if (new URL(req.url).pathname === "/stream") {
@@ -70,7 +70,6 @@
 //     });
 //   } catch (err) {
 //     evtSource?.close();
-//     server.stop(true);
 //     done(err);
 //   }
 // }

diff --git a/test/js/bun/http/async-iterator-stream.test.ts b/test/js/bun/http/async-iterator-stream.test.ts
@@ -4,7 +4,7 @@ import { bunExe, bunEnv } from "harness";
 
 describe("Streaming body via", () => {
   test("async generator function", async () => {
-    const server = Bun.serve({
+    using server = Bun.serve({
       port: 0,
 
       async fetch(req) {
@@ -25,7 +25,6 @@ describe("Streaming body via", () => {
 
     expect(Buffer.concat(chunks).toString()).toBe("Hello, world!!");
     expect(chunks).toHaveLength(2);
-    server.stop(true);
   });
 
   test("async generator function throws an error but continues to send the headers", async () => {
@@ -58,7 +57,7 @@ describe("Streaming body via", () => {
 
   test("async generator aborted doesn't crash", async () => {
     var aborter = new AbortController();
-    const server = Bun.serve({
+    using server = Bun.serve({
       port: 0,
 
       async fetch(req) {
@@ -81,13 +80,11 @@ describe("Streaming body via", () => {
     } catch (e) {
       expect(e).toBeInstanceOf(DOMException);
       expect(e.name).toBe("AbortError");
-    } finally {
-      server.stop(true);
     }
   });
 
   test("[Symbol.asyncIterator]", async () => {
-    const server = Bun.serve({
+    using server = Bun.serve({
       port: 0,
 
       async fetch(req) {
@@ -114,11 +111,10 @@ describe("Streaming body via", () => {
 
     expect(Buffer.concat(chunks).toString()).toBe("my string goes here\nmy buffer goes here\nend!\n!");
     expect(chunks).toHaveLength(2);
-    server.stop(true);
   });
 
   test("[Symbol.asyncIterator] with a custom iterator", async () => {
-    const server = Bun.serve({
+    using server = Bun.serve({
       port: 0,
 
       async fetch(req) {
@@ -151,7 +147,6 @@ describe("Streaming body via", () => {
     expect(Buffer.concat(chunks).toString()).toBe("Hello, world!");
     // TODO:
     // expect(chunks).toHaveLength(2);
-    server.stop(true);
   });
 
   test("yield", async () => {

diff --git a/test/js/bun/http/bun-serve-headers.test.ts b/test/js/bun/http/bun-serve-headers.test.ts
@@ -2,7 +2,7 @@ import { test, expect } from "bun:test";
 
 // https://github.com/oven-sh/bun/issues/9180
 test("weird headers", async () => {
-  const server = Bun.serve({
+  using server = Bun.serve({
     port: 0,
     development: false,
     fetch(req) {
@@ -17,7 +17,7 @@ test("weird headers", async () => {
     },
   });
 
-  try {
+  {
     for (let i = 0; i < 255; i++) {
       const headers = new Headers();
       const name = "X-" + String.fromCharCode(i);
@@ -32,7 +32,5 @@ test("weird headers", async () => {
       });
       expect(res.headers.get(name)).toBe("1");
     }
-  } finally {
-    server.stop(true);
   }
 });