Skip to content

Commit 221e5f1

Browse files
committed
draft version for afterframe measurement
1 parent 3e0fff7 commit 221e5f1

File tree

8 files changed

+1324
-730
lines changed

8 files changed

+1324
-730
lines changed

webdriver-ts/package-lock.json

Lines changed: 851 additions & 708 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

webdriver-ts/package.json

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,37 +17,39 @@
1717
"author": "",
1818
"license": "Apache-2.0",
1919
"devDependencies": {
20-
"@types/lodash": "4.14.186",
21-
"@types/node": "18.11.6",
22-
"@types/ramda": "^0.28.18",
23-
"@types/selenium-webdriver": "4.1.6",
24-
"@types/semver": "7.3.12",
20+
"@types/lodash": "4.14.191",
21+
"@types/node": "18.11.10",
22+
"@types/ramda": "^0.28.20",
23+
"@types/selenium-webdriver": "4.1.9",
24+
"@types/semver": "7.3.13",
2525
"@types/underscore": "^1.11.4",
26-
"@types/yargs": "17.0.13",
27-
"@typescript-eslint/eslint-plugin": "^5.41.0",
28-
"@typescript-eslint/parser": "^5.41.0",
26+
"@types/yargs": "17.0.15",
27+
"@typescript-eslint/eslint-plugin": "^5.45.0",
28+
"@typescript-eslint/parser": "^5.45.0",
2929
"dockerode": "^3.3.4",
30-
"eslint": "^8.26.0",
30+
"eslint": "^8.29.0",
3131
"rimraf": "^3.0.2",
3232
"ts-node": "10.9.1",
33-
"typescript": "4.8.4"
33+
"typescript": "4.9.3"
3434
},
3535
"dependencies": {
36-
"axios": "^1.1.3",
37-
"chromedriver": "^107.0.0",
36+
"axios": "^1.2.0",
37+
"chromedriver": "^108.0.0",
3838
"cross-env": "7.0.3",
3939
"dot": "1.1.3",
40-
"jstat": "1.9.5",
41-
"lighthouse": "9.6.7",
40+
"jstat": "1.9.6",
41+
"lighthouse": "9.6.8",
4242
"lodash": "4.17.21",
4343
"marky": "^1.2.5",
44-
"npm-check-updates": "16.3.15",
45-
"playwright": "^1.27.1",
46-
"puppeteer-core": "^19.2.0",
44+
"npm-check-updates": "16.4.3",
45+
"playwright": "^1.28.1",
46+
"playwright-firefox": "^1.28.1",
47+
"playwright-webkit": "^1.28.1",
48+
"puppeteer-core": "^19.3.0",
4749
"ramda": "^0.28.0",
48-
"selenium-webdriver": "4.5.0",
50+
"selenium-webdriver": "4.7.0",
4951
"semver": "7.3.8",
5052
"underscore": "^1.13.6",
51-
"yargs": "17.6.0"
53+
"yargs": "17.6.2"
5254
}
5355
}

webdriver-ts/src/benchmarkRunner.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ function forkAndCallBenchmark(
2121
forkedRunner = "dist/forkedBenchmarkRunnerPlaywright.js";
2222
} else if (config.BENCHMARK_RUNNER == BENCHMARK_RUNNER.WEBDRIVER) {
2323
forkedRunner = "dist/forkedBenchmarkRunnerWebdriver.js";
24+
} else if (config.BENCHMARK_RUNNER == BENCHMARK_RUNNER.WEBDRIVER_AFTERFRAME) {
25+
forkedRunner = "dist/forkedBenchmarkRunnerWebdriverAfterframe.js";
2426
} else {
2527
forkedRunner = "dist/forkedBenchmarkRunnerPuppeteer.js";
2628
}
@@ -185,6 +187,7 @@ async function runBench(runFrameworks: FrameworkData[], benchmarkInfos: Benchmar
185187
let benchmarkOptions: BenchmarkOptions = {
186188
port: config.PORT.toFixed(),
187189
HOST: config.HOST,
190+
browser: config.BROWSER,
188191
remoteDebuggingPort: config.REMOTE_DEBUGGING_PORT,
189192
chromePort: config.CHROME_PORT,
190193
headless: args.headless,
@@ -252,18 +255,22 @@ let args: any = yargs(process.argv)
252255
.boolean("headless").default("headless", false)
253256
.boolean("smoketest")
254257
.string("runner").default("runner",config.BENCHMARK_RUNNER)
258+
.string("browser").default("browser",config.BROWSER)
255259
.array("framework")
256260
.array("benchmark")
257261
.string("chromeBinary").argv;
258262

259263
let runner = args.runner;
260-
if ([BENCHMARK_RUNNER.WEBDRIVER_CDP,BENCHMARK_RUNNER.WEBDRIVER,BENCHMARK_RUNNER.PLAYWRIGHT,BENCHMARK_RUNNER.PUPPETEER].includes(runner)) {
264+
if ([BENCHMARK_RUNNER.WEBDRIVER_CDP,BENCHMARK_RUNNER.WEBDRIVER,BENCHMARK_RUNNER.WEBDRIVER_AFTERFRAME,
265+
BENCHMARK_RUNNER.PLAYWRIGHT,
266+
BENCHMARK_RUNNER.PUPPETEER].includes(runner)) {
261267
console.log(`INFO: Using ${runner} benchmark runner`)
262268
config.BENCHMARK_RUNNER = runner;
263269
} else {
264270
console.log("ERROR: argument driver has illegal value "+runner, [BENCHMARK_RUNNER.WEBDRIVER_CDP,BENCHMARK_RUNNER.WEBDRIVER,BENCHMARK_RUNNER.PLAYWRIGHT,BENCHMARK_RUNNER.PUPPETEER]);
265271
process.exit(1);
266272
}
273+
config.BROWSER = args.browser;
267274

268275
let allArgs = args._.length <= 2 ? [] : args._.slice(2, args._.length);
269276
let frameworkArgument = !args.framework ? allArgs : args.framework;

0 commit comments

Comments
 (0)