Increase unit-tests timeout, improve error display, add set -e

FREEBIE
pull/749/head
Scott Nonnenberg 8 years ago
parent e1495e779c
commit f43a5986da
No known key found for this signature in database
GPG Key ID: A4931C09644C654B

@ -369,7 +369,7 @@ module.exports = function(grunt) {
return app.client.execute(getMochaResults).then(function(data) {
return Boolean(data.value);
});
}, 5000, 'Expected to find window.mochaResults set!');
}, 10000, 'Expected to find window.mochaResults set!');
}).then(function() {
return app.client.execute(getMochaResults);
}).then(function(data) {
@ -384,7 +384,7 @@ module.exports = function(grunt) {
}
}).catch(function (error) {
failure = function() {
grunt.fail.fatal('Something went wrong: ' + error.stack);
grunt.fail.fatal('Something went wrong: ' + error.message + ' ' + error.stack);
};
}).then(function () {
// We need to use the failure variable and this early stop to clean up before
@ -397,7 +397,7 @@ module.exports = function(grunt) {
}
done();
}).catch(function (error) {
console.error('Second-level error:', error.stack);
console.error('Second-level error:', error.message, error.stack);
if (failure) {
failure();
}

@ -1,9 +1,13 @@
#!/usr/bin/env bash
set -e
if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then
export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start
sleep 3
fi
grunt test
grunt test-release:$TRAVIS_OS_NAME

Loading…
Cancel
Save