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

createTaskWithTimeout: Don't log expiration if task threw (#1412)

Browse source 
FREEBIE
This commit is contained in:
Scott Nonnenberg 2017-08-30 13:33:55 -07:00 committed by GitHub
parent 3f7fbd93d5
commit 46b64e306f
3 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
js/libtextsecure.js
View file

@ -40272,7 +40272,13 @@ libsignal.ProvisioningCipher = function() {
return reject(error);
};
var promise = task();
var promise;
try {
promise = task();
} catch(error) {
clearTimer();
throw error;
}
if (!promise || !promise.then) {
clearTimer();
complete = true;

8
libtextsecure/task_with_timeout.js
View file

@ -51,7 +51,13 @@
return reject(error);
};
var promise = task();
var promise;
try {
promise = task();
} catch(error) {
clearTimer();
throw error;
}
if (!promise || !promise.then) {
clearTimer();
complete = true;

18
libtextsecure/test/task_with_timeout_test.js
View file

@ -22,13 +22,13 @@ describe('createTaskWithTimeout', function() {
assert.strictEqual(error, flowedError);
});
});
it('rejects if promise takes too long', function() {
it('rejects if promise takes too long (this one logs error to console)', function() {
var error = new Error('original');
var complete = false;
var task = function() {
return new Promise(function(resolve) {
setTimeout(function() {
completed = true;
complete = true;
resolve();
}, 3000);
});
@ -57,4 +57,18 @@ describe('createTaskWithTimeout', function() {
assert.strictEqual(result, 'hi!')
});
});
it('rejects if task throws (and does not log about taking too long)', function() {
var error = new Error('Task is throwing!');
var task = function() {
throw error;
};
var taskWithTimeout = textsecure.createTaskWithTimeout(task, this.name, {
timeout: 10
});
return taskWithTimeout().then(function(result) {
throw new Error('Overall task should reject!')
}, function(flowedError) {
assert.strictEqual(flowedError, error);
});
});
});