Compare commits

...

3 Commits

2 changed files with 6 additions and 5 deletions

View File

@ -72,14 +72,15 @@ describe('Responsiveness of Editor', function() {
} }
helper.waitFor(function(){ // Wait for the ability to process helper.waitFor(function(){ // Wait for the ability to process
return true; // Ghetto but works for now var el = inner$('body');
if(el[0].textContent.length > amount) return true;
}).done(function(){ }).done(function(){
var end = Date.now(); // get the current time var end = Date.now(); // get the current time
var delay = end - start; // get the delay as the current time minus the start time var delay = end - start; // get the delay as the current time minus the start time
expect(delay).to.be.below(400); expect(delay).to.be.below(600);
done(); done();
}, 1000); }, 5000);
}, 10000); }, 10000);
}); });

View File

@ -41,8 +41,8 @@ curl http://localhost:9001/p/minifyme -f -s > /dev/null
sleep 10 sleep 10
# run the backend tests # run the backend tests
echo "Now run the load tests for 30 seconds and if it stalls before 100 then error" echo "Now run the load tests for 25 seconds and if it stalls before 100 then error"
etherpad-loadtest -d 30 etherpad-loadtest -d 25
exit_code=$? exit_code=$?
kill $! kill $!