mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

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

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-05-15 17:55:48 -07:00
parent e1495e779c
commit f43a5986da
No known key found for this signature in database
GPG key ID: A4931C09644C654B
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Gruntfile.js
View file

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

4
travis.sh
View file

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