honeymoose/angular-cn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(benchpress): fix flake

Browse Source 
memory was not allocated to be high enough, resulting in partial results to be
clipped, and therefore failing the assertions

Closes #6161
This commit is contained in:
Hank Duan 2015-12-28 17:47:49 -08:00
parent d116861c8e
commit 9d28147acb
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/benchpress/src/firefox_extension/lib/main.ts
View File

@ -54,7 +54,7 @@ mod.PageMod({
contentScriptFile: data.url('installed_script.js'), contentScriptFile: data.url('installed_script.js'),
onAttach: worker => { onAttach: worker => {
worker.port.on('startProfiler', 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)); ['leaf', 'js', 'stackwalk', 'gc'], timeStarted));
worker.port.on('stopProfiler', () => profiler.stop()); worker.port.on('stopProfiler', () => profiler.stop());
worker.port.on('getProfile', worker.port.on('getProfile',

1
modules/benchpress/test/firefox_extension/spec.ts
View File

@ -24,6 +24,7 @@ describe('firefox extension', function() {
browser.executeScript('window.startProfiler()') browser.executeScript('window.startProfiler()')
.then(function() { console.log('started measuring perf'); }); .then(function() { console.log('started measuring perf'); });
browser.executeAsyncScript('setTimeout(arguments[0], 1000);');
browser.executeScript('window.forceGC()'); browser.executeScript('window.forceGC()');
browser.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);') browser.executeAsyncScript('var cb = arguments[0]; window.getProfile(cb);')

5
scripts/ci/test_e2e_js.sh
View File

@ -30,8 +30,5 @@ fi
./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS ./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS
./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS --benchmark --dryrun ./node_modules/.bin/protractor protractor-js.conf.js $OPTIONS --benchmark --dryrun
# TODO(tbosch): tests for benchpress on firefox are disabled ./node_modules/.bin/protractor dist/js/cjs/benchpress/test/firefox_extension/conf.js
# 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