Skip to content

Commit 47542b0

Browse files
committed
fix(build): don’t read out chrome perflogs during e2e tests
We do this as we are seeing flakes in Chrome with ECONNREFUSED. Also reuses the same browser window. Also reenables the infinite scroll benchmark Closes angular#1137
1 parent 6c60c3e commit 47542b0

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

modules/benchmarks/e2e_test/naive_infinite_scroll_perf.es6

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ describe('ng2 naive infinite scroll benchmark', function () {
77
afterEach(perfUtil.verifyNoBrowserErrors);
88

99
[1, 2, 4].forEach(function(appSize) {
10-
// TODO: reenable these tests when the are passing. See issue #1137
11-
xit('should run scroll benchmark and collect stats for appSize = ' +
10+
it('should run scroll benchmark and collect stats for appSize = ' +
1211
appSize, function(done) {
1312
perfUtil.runBenchmark({
1413
url: URL,

protractor-shared.js

+7-5
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ var config = exports.config = {
135135
// During benchmarking, we need to open a new browser
136136
// for every benchmark, otherwise the numbers can get skewed
137137
// from other benchmarks (e.g. Chrome keeps JIT caches, ...)
138-
if (argv['benchmark']) {
138+
if (argv['benchmark'] && !argv['dryrun']) {
139139
var originalBrowser = browser;
140140
var _tmpBrowser;
141141
beforeEach(function() {
@@ -225,19 +225,21 @@ exports.createBenchpressRunner = function(options) {
225225
'lang': options.lang,
226226
'runId': runId
227227
}),
228-
benchpress.MultiReporter.createBindings([
229-
benchpress.ConsoleReporter,
230-
benchpress.JsonFileReporter
231-
]),
232228
benchpress.JsonFileReporter.BINDINGS,
233229
benchpress.bind(benchpress.JsonFileReporter.PATH).toValue(resultsFolder)
234230
];
235231
if (!argv['dryrun']) {
236232
bindings.push(benchpress.Validator.bindTo(benchpress.RegressionSlopeValidator));
237233
bindings.push(benchpress.bind(benchpress.RegressionSlopeValidator.SAMPLE_SIZE).toValue(argv['sample-size']));
234+
bindings.push(benchpress.MultiReporter.createBindings([
235+
benchpress.ConsoleReporter,
236+
benchpress.JsonFileReporter
237+
]));
238238
} else {
239239
bindings.push(benchpress.Validator.bindTo(benchpress.SizeValidator));
240240
bindings.push(benchpress.bind(benchpress.SizeValidator.SAMPLE_SIZE).toValue(1));
241+
bindings.push(benchpress.MultiReporter.createBindings([]));
242+
bindings.push(benchpress.MultiMetric.createBindings([]));
241243
}
242244

243245
global.benchpressRunner = new benchpress.Runner(bindings);

0 commit comments

Comments
 (0)