PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Fix timelinepanel test timeout

Browse source 
The previous fix was adjusting the wrong timeout: it's hitting browserNoActivityTimeout, so revert previous fix & do this instead
This commit is contained in:
David Baker 2016-07-05 14:34:33 +01:00
parent 63ad57a8d4
commit a2b64798f7
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
karma.conf.js
View file

@ -171,5 +171,6 @@ module.exports = function (config) {
}, },
devtool: 'inline-source-map', devtool: 'inline-source-map',
}, },
browserNoActivityTimeout: 15000,
}); });
}; };

2
test/components/structures/TimelinePanel-test.js
View file

@ -210,7 +210,7 @@ describe('TimelinePanel', function() {
var N_EVENTS = 600; var N_EVENTS = 600;
// sadly, loading all those events takes a while // sadly, loading all those events takes a while
this.timeout(N_EVENTS * 40); this.timeout(N_EVENTS * 20);
// client.getRoom is called a /lot/ in this test, so replace // client.getRoom is called a /lot/ in this test, so replace
// sinon's spy with a fast noop. // sinon's spy with a fast noop.