NVIDIA
diff --git a/‎src/lib/onboard/dashboard-port.test.ts‎
Lines changed: 29 additions & 1 deletion b/‎src/lib/onboard/dashboard-port.test.ts‎
Lines changed: 29 additions & 1 deletion
diff --git a/‎src/lib/onboard/dashboard-port.ts‎
Lines changed: 3 additions & 3 deletions b/‎src/lib/onboard/dashboard-port.ts‎
Lines changed: 3 additions & 3 deletions
@@ -40,6 +40,11 @@ async function closeServer(server: Server): Promise<void> {
   });
 }
 
+async function listenAndCloseOnLoopback(port: number): Promise<void> {
+  const server = await listenOnLoopback(port);
+  await closeServer(server);
+}
+
 async function unusedLoopbackPort(): Promise<number> {
   const server = await listenOnLoopback(0);
   const address = server.address();
@@ -363,7 +368,7 @@ describe("dashboard port reservation", () => {
       withDashboardPortReservationScope(async (scope) => {
         scope.current = await reserveDashboardPort(port);
         await assert.rejects(
-          listenOnLoopback(port),
+          listenAndCloseOnLoopback(port),
           (error: NodeJS.ErrnoException) => error.code === "EADDRINUSE",
         );
         throw new Error("sandbox build failed");
@@ -375,6 +380,29 @@ describe("dashboard port reservation", () => {
     await closeServer(listener);
   });
 
+  it("releases the selected port when finalization calls the extracted scope callback (#9568)", async () => {
+    const port = await unusedLoopbackPort();
+
+    await withDashboardPortReservationScope(async (scope) => {
+      scope.current = await reserveDashboardPort(port);
+      await assert.rejects(
+        listenAndCloseOnLoopback(port),
+        (error: NodeJS.ErrnoException) => error.code === "EADDRINUSE",
+      );
+
+      const finalizationDashboard = { releasePort: scope.release };
+      await finalizationDashboard.releasePort();
+
+      assert.equal(scope.current, null);
+      const listener = await listenOnLoopback(port);
+      try {
+        assert.equal(listener.listening, true);
+      } finally {
+        await closeServer(listener);
+      }
+    });
+  });
+
   it("reselects before sandbox creation when a listener wins the allocation race (#8798)", async () => {
     const attempts: number[] = [];
     const warnings: string[] = [];
 
@@ -610,9 +610,9 @@ export async function withDashboardPortReservationScope<T>(
 ): Promise<T> {
   const scope: DashboardPortReservationScope = {
     current: null,
-    async release() {
-      const reservation = this.current;
-      this.current = null;
+    release: async () => {
+      const reservation = scope.current;
+      scope.current = null;
       await reservation?.release();
     },
   };