Skip to content

Commit

Permalink
fix(benchpress): fix flake
Browse files Browse the repository at this point in the history
memory was not allocated to be high enough, resulting in partial results to be
clipped, and therefore failing the assertions

Closes #6161
  • Loading branch information
hankduan committed Jan 4, 2016
1 parent d116861 commit 9d28147
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion modules/benchpress/src/firefox_extension/lib/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ mod.PageMod({
contentScriptFile: data.url('installed_script.js'),
onAttach: worker => {
worker.port.on('startProfiler',
(timeStarted) => profiler.start(/* = profiler memory */ 1000000, 0.1,
(timeStarted) => profiler.start(/* = profiler memory */ 3000000, 0.1,
['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
worker.port.on('stopProfiler', () => profiler.stop());
worker.port.on('getProfile',
Expand Down
1 change: 1 addition & 0 deletions modules/benchpress/test/firefox_extension/spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ describe('firefox extension', function() {
browser.executeScript('window.startProfiler()')
.then(function() { console.log('started measuring perf'); });

browser.executeAsyncScript('setTimeout(arguments[0], 1000);');
browser.executeScript('window.forceGC()');

browser.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);')
Expand Down
5 changes: 1 addition & 4 deletions scripts/ci/test_e2e_js.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,5 @@ fi

./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS
./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS --benchmark --dryrun
# TODO(tbosch): tests for benchpress on firefox are disabled
# as they are very flake. Enable once https://github.com/angular/angular/issues/5611
# is resolved.
# ./node_modules/.bin/protractor dist/js/cjs/benchpress/test/firefox_extension/conf.js
./node_modules/.bin/protractor dist/js/cjs/benchpress/test/firefox_extension/conf.js

0 comments on commit 9d28147

Please sign in to comment.