update for chrome 104

krausest · Aug 4, 2022 · d1bc7e7 · d1bc7e7
1 parent 5667d4f
commit d1bc7e7
Show file tree

Hide file tree

Showing 9 changed files with 4,990 additions and 4,710 deletions.
diff --git a/webdriver-ts-results/src/App.tsx b/webdriver-ts-results/src/App.tsx
@@ -15,8 +15,8 @@ const App = (): JSX.Element => {
     return (
       <div>
         {disclaimer}
-        <p>The benchmark was run on a MaBook Air M1 (16 GB RAM, OSX 12.4), Chrome 103.0.5060.53 (arm64))
-            using the playwright benchmark driver with reduced tracing.
+        <p>The benchmark was run on a MaBook Air M1 (16 GB RAM, OSX 12.5), Chrome 104.0.5112.79 (arm64))
+            using the puppeteer benchmark driver with reduced tracing.
         </p>
          <SelectionBar/>
          <ResultTable type={FrameworkType.KEYED}/>

diff --git a/webdriver-ts-results/src/reducer.ts b/webdriver-ts-results/src/reducer.ts
@@ -3,7 +3,8 @@ import { benchmarks as benchmark_orig, frameworks, results as rawResults } from
 
 // Temporarily disable script bootup time
 //const benchmarks = benchmark_orig;
-const benchmarks = benchmark_orig.filter(b => b.id !== '32_startup-bt');
+const benchmarks = benchmark_orig.filter(b => b.id !== '32_startup-bt'
+        && b.id !== '33_startup-mainthreadcost');
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const jStat = require('jstat').jStat;

diff --git a/webdriver-ts-results/src/results.ts b/webdriver-ts-results/src/results.ts
diff --git a/webdriver-ts-results/table.html b/webdriver-ts-results/table.html
diff --git a/webdriver-ts/package-lock.json b/webdriver-ts/package-lock.json
diff --git a/webdriver-ts/package.json b/webdriver-ts/package.json
@@ -18,34 +18,34 @@
   "license": "Apache-2.0",
   "devDependencies": {
     "@types/lodash": "4.14.182",
-    "@types/node": "18.0.0",
-    "@types/ramda": "^0.28.14",
-    "@types/selenium-webdriver": "4.1.1",
+    "@types/node": "18.6.3",
+    "@types/ramda": "^0.28.15",
+    "@types/selenium-webdriver": "4.1.2",
     "@types/semver": "7.3.10",
     "@types/underscore": "^1.11.4",
     "@types/yargs": "17.0.10",
-    "@typescript-eslint/eslint-plugin": "^5.30.4",
-    "@typescript-eslint/parser": "^5.30.4",
-    "dockerode": "^3.3.2",
-    "eslint": "^8.19.0",
+    "@typescript-eslint/eslint-plugin": "^5.32.0",
+    "@typescript-eslint/parser": "^5.32.0",
+    "dockerode": "^3.3.3",
+    "eslint": "^8.21.0",
     "rimraf": "^3.0.2",
-    "ts-node": "10.8.1",
+    "ts-node": "10.9.1",
     "typescript": "4.7.4"
   },
   "dependencies": {
     "axios": "^0.27.2",
-    "chromedriver": "^102.0.0",
+    "chromedriver": "^103.0.0",
     "cross-env": "7.0.3",
     "dot": "1.1.3",
     "jstat": "1.9.5",
-    "lighthouse": "9.6.2",
+    "lighthouse": "9.6.5",
     "lodash": "4.17.21",
-    "marky": "^1.2.4",
-    "npm-check-updates": "14.0.1",
-    "playwright": "^1.22.2",
-    "puppeteer-core": "^14.4.1",
+    "marky": "^1.2.5",
+    "npm-check-updates": "16.0.5",
+    "playwright": "^1.24.2",
+    "puppeteer-core": "^15.5.0",
     "ramda": "^0.28.0",
-    "selenium-webdriver": "4.2.0",
+    "selenium-webdriver": "4.3.1",
     "semver": "7.3.7",
     "underscore": "^1.13.4",
     "yargs": "17.5.1"

diff --git a/webdriver-ts/results.json b/webdriver-ts/results.json
diff --git a/webdriver-ts/src/common.ts b/webdriver-ts/src/common.ts
@@ -71,7 +71,7 @@ export let config = {
   TRACES_DIRECTORY: "traces",
   ALLOW_BATCHING: true,
   HOST: 'localhost',
-  BENCHMARK_RUNNER: BENCHMARK_RUNNER.PLAYWRIGHT
+  BENCHMARK_RUNNER: BENCHMARK_RUNNER.PUPPETEER
 };
 export type TConfig = typeof config;
 

diff --git a/webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts b/webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts
@@ -69,7 +69,12 @@ async function runCPUBenchmark(framework: FrameworkData, benchmark: CPUBenchmark
             });
         // }
         for (let i = 0; i <benchmarkOptions.batchSize; i++) {
-            await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
+            try {
+              await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
+            } catch (ex) {
+              console.log("**** loading benchmark failed, retrying");
+              await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
+            }
 
             // await (driver as any).sendDevToolsCommand('Network.enable');
             // await (driver as any).sendDevToolsCommand('Network.emulateNetworkConditions', {
@@ -113,11 +118,11 @@ async function runCPUBenchmark(framework: FrameworkData, benchmark: CPUBenchmark
               await page.emulateCPUThrottling(benchmark.benchmarkInfo.throttleCPU);
           }
 
-            await page.tracing.start({path: fileNameTrace(framework, benchmark.benchmarkInfo, i), 
-                screenshots: false,
-                categories:categories
-            });
-           await forceGC(page, client);
+          await page.tracing.start({path: fileNameTrace(framework, benchmark.benchmarkInfo, i), 
+            screenshots: false,
+            categories:categories
+          });
+          await forceGC(page, client);
             console.log("runBenchmark");
             // let m1 = await page.metrics();
             await runBenchmark(page, benchmark, framework);