From 3ce6105a3a6f01b7f3f1025099c2b32b16af517c Mon Sep 17 00:00:00 2001
From: Thorsten Kober <tkober@gmail.com>
Date: Mon, 21 Oct 2024 11:54:42 -0400
Subject: [PATCH] Cleanup to prepare for postMessage / remote runner (#435)

---
 resources/benchmark-runner.mjs   | 17 +++++++++--------
 tests/benchmark-runner-tests.mjs |  2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/resources/benchmark-runner.mjs b/resources/benchmark-runner.mjs
index e791f4a80..61c818b46 100644
--- a/resources/benchmark-runner.mjs
+++ b/resources/benchmark-runner.mjs
@@ -403,10 +403,6 @@ export class BenchmarkRunner {
         const prepareEndLabel = "runner-prepare-end";
 
         performance.mark(prepareStartLabel);
-        this._removeFrame();
-        await this._appendFrame();
-        this._page = new Page(this._frame);
-
         let suites = [...this._suites];
         if (this._suiteOrderRandomNumberGenerator)
             this._shuffleSuites(suites);
@@ -432,10 +428,17 @@ export class BenchmarkRunner {
         const suites = await this._prepareAllSuites();
         try {
             for (const suite of suites) {
-                if (!suite.disabled)
+                if (suite.disabled)
+                    continue;
+
+                try {
+                    await this._appendFrame();
+                    this._page = new Page(this._frame);
                     await this.runSuite(suite);
+                } finally {
+                    this._removeFrame();
+                }
             }
-
         } finally {
             await this._finishRunAllSuites();
         }
@@ -446,8 +449,6 @@ export class BenchmarkRunner {
         const finalizeEndLabel = "runner-finalize-end";
 
         performance.mark(finalizeStartLabel);
-        // Remove frame to clear the view for displaying the results.
-        this._removeFrame();
         await this._finalize();
         performance.mark(finalizeEndLabel);
         performance.measure("runner-finalize", finalizeStartLabel, finalizeEndLabel);
diff --git a/tests/benchmark-runner-tests.mjs b/tests/benchmark-runner-tests.mjs
index b11bde160..57c360b17 100644
--- a/tests/benchmark-runner-tests.mjs
+++ b/tests/benchmark-runner-tests.mjs
@@ -138,7 +138,7 @@ describe("BenchmarkRunner", () => {
 
             it("should remove the previous frame and then the current frame", () => {
                 assert.calledTwice(_loadFrameStub);
-                assert.calledOnce(_appendFrameStub);
+                assert.calledTwice(_appendFrameStub);
                 assert.calledTwice(_removeFrameStub);
             });