diff options
| author | Erik Larkö <erik@mullvad.net> | 2017-08-29 12:13:25 +0200 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-08-29 12:13:25 +0200 |
| commit | 6fd2fed683adcaac99e1b0b6d46ff80ba766b746 (patch) | |
| tree | 8b6ccb51394741d1f3371d239cc79435c8dfe84e /test | |
| parent | a257fe44b7ccf8d4712cbfc08134a1a658d8ebaa (diff) | |
| parent | 18f76dcc47bf91b9b2524da79117288b972ec65a (diff) | |
| download | mullvadvpn-6fd2fed683adcaac99e1b0b6d46ff80ba766b746.tar.xz mullvadvpn-6fd2fed683adcaac99e1b0b6d46ff80ba766b746.zip | |
Merge branch 'ipc-timeout'
Diffstat (limited to 'test')
| -rw-r--r-- | test/ipc.spec.js | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/test/ipc.spec.js b/test/ipc.spec.js index ae9c5ab815..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]); @@ -62,8 +62,7 @@ describe('The IPC server', () => { it('should timeout if no response is returned', () => { const { ipc } = setupIpc(); - ipc.setSendTimeout(1); - return ipc.send('a message') + return ipc.send('a message', [], 1) .catch((e) => { expect(e.name).to.equal('TimeOutError'); expect(e.message).to.contain('timed out'); |
