summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorErik Larkö <erik@mullvad.net>2017-08-29 10:19:39 +0200
committerErik Larkö <erik@mullvad.net>2017-08-29 10:52:04 +0200
commit18f76dcc47bf91b9b2524da79117288b972ec65a (patch)
tree8b6ccb51394741d1f3371d239cc79435c8dfe84e
parent08b5efa05a8a69ace12356eac90676b589679868 (diff)
downloadmullvadvpn-18f76dcc47bf91b9b2524da79117288b972ec65a.tar.xz
mullvadvpn-18f76dcc47bf91b9b2524da79117288b972ec65a.zip
Increase default ipc timeout
-rw-r--r--app/lib/jsonrpc-ws-ipc.js2
-rw-r--r--test/ipc.spec.js4
2 files changed, 3 insertions, 3 deletions
diff --git a/app/lib/jsonrpc-ws-ipc.js b/app/lib/jsonrpc-ws-ipc.js
index 10515278d9..46ccf51668 100644
--- a/app/lib/jsonrpc-ws-ipc.js
+++ b/app/lib/jsonrpc-ws-ipc.js
@@ -64,7 +64,7 @@ export class InvalidReply extends Error {
}
}
-const DEFAULT_TIMEOUT_MILLIS = 750;
+const DEFAULT_TIMEOUT_MILLIS = 5000;
export default class Ipc {
diff --git a/test/ipc.spec.js b/test/ipc.spec.js
index c664ef83c3..6e02ab94b1 100644
--- a/test/ipc.spec.js
+++ b/test/ipc.spec.js
@@ -46,14 +46,14 @@ describe('The IPC server', () => {
ws.on('a message', (msg) => ws.replyOk(msg.id, 'a reply'));
- const decoy = ipc.send('a decoy')
+ const decoy = ipc.send('a decoy', [], 1)
.then(() => assert(false, 'Should not be called'))
.catch(e => {
if (e.name !== 'TimeOutError') {
throw e;
}
});
- const message = ipc.send('a message')
+ const message = ipc.send('a message', [], 1)
.then((reply) => expect(reply).to.equal('a reply'));
return Promise.all([message, decoy]);