Skip to content

Commit 5ef18e1

Browse files
committed
fix tests
1 parent b5687c6 commit 5ef18e1

File tree

1 file changed

+22
-20
lines changed

1 file changed

+22
-20
lines changed

test/server.js

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
var Client = require('../')
22
var common = require('./common')
33
var test = require('tape')
4-
// var wrtc = require('electron-webrtc')()
4+
var wrtc = require('electron-webrtc')()
55

6-
// var wrtcReady = false
7-
// wrtc.electronDaemon.once('ready', function () {
8-
// wrtcReady = true
9-
// })
6+
var wrtcReady = false
7+
wrtc.electronDaemon.once('ready', function () {
8+
wrtcReady = true
9+
})
1010

1111
var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
1212
var peerId = new Buffer('01234567890123456789')
@@ -31,7 +31,7 @@ function serverTest (t, serverType, serverFamily) {
3131
infoHash: infoHash,
3232
length: torrentLength,
3333
announce: [ announceUrl ]
34-
}/*, { wrtc: wrtc }*/)
34+
}, { wrtc: wrtc })
3535

3636
client1.start()
3737

@@ -87,7 +87,7 @@ function serverTest (t, serverType, serverFamily) {
8787
infoHash: infoHash,
8888
length: torrentLength,
8989
announce: [ announceUrl ]
90-
}/*, { wrtc: wrtc }*/)
90+
}, { wrtc: wrtc })
9191

9292
client2.start()
9393

@@ -111,9 +111,11 @@ function serverTest (t, serverType, serverFamily) {
111111
t.equal(data.complete, 0)
112112
t.equal(data.incomplete, 0)
113113

114-
client1.destroy()
115-
server.close()
116-
// if (serverType === 'ws') wrtc.close()
114+
client1.destroy(function () {
115+
server.close(function () {
116+
if (serverType === 'ws') wrtc.close()
117+
})
118+
})
117119
})
118120
})
119121
})
@@ -124,16 +126,16 @@ function serverTest (t, serverType, serverFamily) {
124126
})
125127
}
126128

127-
// test('websocket server', function (t) {
128-
// if (wrtcReady) {
129-
// runTest()
130-
// } else {
131-
// wrtc.electronDaemon.once('ready', runTest)
132-
// }
133-
// function runTest () {
134-
// serverTest(t, 'ws', 'inet')
135-
// }
136-
// })
129+
test('websocket server', function (t) {
130+
if (wrtcReady) {
131+
runTest()
132+
} else {
133+
wrtc.electronDaemon.once('ready', runTest)
134+
}
135+
function runTest () {
136+
serverTest(t, 'ws', 'inet')
137+
}
138+
})
137139

138140
test('http ipv4 server', function (t) {
139141
serverTest(t, 'http', 'inet')

0 commit comments

Comments
 (0)