Skip to content

Commit 0b7edf8

Browse files
committed
try to make wrtc test reliable on node v5
1 parent 2376fe6 commit 0b7edf8

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

test/server.js

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,19 @@
11
var Client = require('../')
22
var common = require('./common')
33
var test = require('tape')
4-
var wrtc
4+
var wrtc = require('electron-webrtc')()
5+
6+
var wrtcReady = false
7+
wrtc.electronDaemon.once('ready', function () {
8+
wrtcReady = true
9+
})
510

611
var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
712
var peerId = new Buffer('01234567890123456789')
813
var peerId2 = new Buffer('12345678901234567890')
914
var torrentLength = 50000
1015

11-
function serverTest (t, serverType, serverFamily, cb) {
16+
function serverTest (t, serverType, serverFamily) {
1217
t.plan(30)
1318

1419
var hostname = serverFamily === 'inet6'
@@ -107,7 +112,8 @@ function serverTest (t, serverType, serverFamily, cb) {
107112
t.equal(data.incomplete, 0)
108113

109114
client1.destroy()
110-
server.close(cb)
115+
server.close()
116+
if (serverType === 'ws') wrtc.close()
111117
})
112118
})
113119
})
@@ -119,12 +125,14 @@ function serverTest (t, serverType, serverFamily, cb) {
119125
}
120126

121127
test('websocket server', function (t) {
122-
wrtc = require('electron-webrtc')()
123-
wrtc.electronDaemon.once('ready', function () {
124-
serverTest(t, 'ws', 'inet', function () {
125-
wrtc.close()
126-
})
127-
})
128+
if (wrtcReady) {
129+
runTest()
130+
} else {
131+
wrtc.electronDaemon.once('ready', runTest)
132+
}
133+
function runTest () {
134+
serverTest(t, 'ws', 'inet')
135+
}
128136
})
129137

130138
test('http ipv4 server', function (t) {

0 commit comments

Comments
 (0)