Skip to content

Commit d1bc7e7

Browse files
krausestkrausest
committed
update for chrome 104
1 parent 5667d4f commit d1bc7e7

File tree

9 files changed

+4990
-4710
lines changed

9 files changed

+4990
-4710
lines changed

Diff for: ‎webdriver-ts-results/src/App.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const App = (): JSX.Element => {
1515
return (
1616
<div>
1717
{disclaimer}
18-
<p>The benchmark was run on a MaBook Air M1 (16 GB RAM, OSX 12.4), Chrome 103.0.5060.53 (arm64))
19-
using the playwright benchmark driver with reduced tracing.
18+
<p>The benchmark was run on a MaBook Air M1 (16 GB RAM, OSX 12.5), Chrome 104.0.5112.79 (arm64))
19+
using the puppeteer benchmark driver with reduced tracing.
2020
</p>
2121
<SelectionBar/>
2222
<ResultTable type={FrameworkType.KEYED}/>

Diff for: ‎webdriver-ts-results/src/reducer.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ import { benchmarks as benchmark_orig, frameworks, results as rawResults } from
33

44
// Temporarily disable script bootup time
55
//const benchmarks = benchmark_orig;
6-
const benchmarks = benchmark_orig.filter(b => b.id !== '32_startup-bt');
6+
const benchmarks = benchmark_orig.filter(b => b.id !== '32_startup-bt'
7+
&& b.id !== '33_startup-mainthreadcost');
78
// eslint-disable-next-line @typescript-eslint/no-explicit-any
89
// eslint-disable-next-line @typescript-eslint/no-var-requires
910
const jStat = require('jstat').jStat;

Diff for: ‎webdriver-ts-results/src/results.ts

+3,207-3,171
Large diffs are not rendered by default.

Diff for: ‎webdriver-ts-results/table.html

+1-1
Large diffs are not rendered by default.

Diff for: ‎webdriver-ts/package-lock.json

+1,750-1,512
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎webdriver-ts/package.json

+15-15
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,34 @@
1818
"license": "Apache-2.0",
1919
"devDependencies": {
2020
"@types/lodash": "4.14.182",
21-
"@types/node": "18.0.0",
22-
"@types/ramda": "^0.28.14",
23-
"@types/selenium-webdriver": "4.1.1",
21+
"@types/node": "18.6.3",
22+
"@types/ramda": "^0.28.15",
23+
"@types/selenium-webdriver": "4.1.2",
2424
"@types/semver": "7.3.10",
2525
"@types/underscore": "^1.11.4",
2626
"@types/yargs": "17.0.10",
27-
"@typescript-eslint/eslint-plugin": "^5.30.4",
28-
"@typescript-eslint/parser": "^5.30.4",
29-
"dockerode": "^3.3.2",
30-
"eslint": "^8.19.0",
27+
"@typescript-eslint/eslint-plugin": "^5.32.0",
28+
"@typescript-eslint/parser": "^5.32.0",
29+
"dockerode": "^3.3.3",
30+
"eslint": "^8.21.0",
3131
"rimraf": "^3.0.2",
32-
"ts-node": "10.8.1",
32+
"ts-node": "10.9.1",
3333
"typescript": "4.7.4"
3434
},
3535
"dependencies": {
3636
"axios": "^0.27.2",
37-
"chromedriver": "^102.0.0",
37+
"chromedriver": "^103.0.0",
3838
"cross-env": "7.0.3",
3939
"dot": "1.1.3",
4040
"jstat": "1.9.5",
41-
"lighthouse": "9.6.2",
41+
"lighthouse": "9.6.5",
4242
"lodash": "4.17.21",
43-
"marky": "^1.2.4",
44-
"npm-check-updates": "14.0.1",
45-
"playwright": "^1.22.2",
46-
"puppeteer-core": "^14.4.1",
43+
"marky": "^1.2.5",
44+
"npm-check-updates": "16.0.5",
45+
"playwright": "^1.24.2",
46+
"puppeteer-core": "^15.5.0",
4747
"ramda": "^0.28.0",
48-
"selenium-webdriver": "4.2.0",
48+
"selenium-webdriver": "4.3.1",
4949
"semver": "7.3.7",
5050
"underscore": "^1.13.4",
5151
"yargs": "17.5.1"

Diff for: ‎webdriver-ts/results.json

+1-1
Large diffs are not rendered by default.

Diff for: ‎webdriver-ts/src/common.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export let config = {
7171
TRACES_DIRECTORY: "traces",
7272
ALLOW_BATCHING: true,
7373
HOST: 'localhost',
74-
BENCHMARK_RUNNER: BENCHMARK_RUNNER.PLAYWRIGHT
74+
BENCHMARK_RUNNER: BENCHMARK_RUNNER.PUPPETEER
7575
};
7676
export type TConfig = typeof config;
7777

Diff for: ‎webdriver-ts/src/forkedBenchmarkRunnerPuppeteer.ts

+11-6
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,12 @@ async function runCPUBenchmark(framework: FrameworkData, benchmark: CPUBenchmark
6969
});
7070
// }
7171
for (let i = 0; i <benchmarkOptions.batchSize; i++) {
72-
await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
72+
try {
73+
await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
74+
} catch (ex) {
75+
console.log("**** loading benchmark failed, retrying");
76+
await page.goto(`http://${benchmarkOptions.HOST}:${benchmarkOptions.port}/${framework.uri}/index.html`, {waitUntil: "networkidle0"});
77+
}
7378

7479
// await (driver as any).sendDevToolsCommand('Network.enable');
7580
// await (driver as any).sendDevToolsCommand('Network.emulateNetworkConditions', {
@@ -113,11 +118,11 @@ async function runCPUBenchmark(framework: FrameworkData, benchmark: CPUBenchmark
113118
await page.emulateCPUThrottling(benchmark.benchmarkInfo.throttleCPU);
114119
}
115120

116-
await page.tracing.start({path: fileNameTrace(framework, benchmark.benchmarkInfo, i),
117-
screenshots: false,
118-
categories:categories
119-
});
120-
await forceGC(page, client);
121+
await page.tracing.start({path: fileNameTrace(framework, benchmark.benchmarkInfo, i),
122+
screenshots: false,
123+
categories:categories
124+
});
125+
await forceGC(page, client);
121126
console.log("runBenchmark");
122127
// let m1 = await page.metrics();
123128
await runBenchmark(page, benchmark, framework);

0 commit comments

Comments
 (0)