OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix timelinepanel test timeout 

The previous fix was adjusting the wrong timeout: it's hitting browserNoActivityTimeout, so revert previous fix & do this instead
pull/21833/head
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.