Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ language: node_js
sudo: false
node_js:
- "node"
- "4"
before_script:
- export DISPLAY=:99.0; sh -e /etc/init.d/xvfb start
41 changes: 21 additions & 20 deletions test/server.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
var Client = require('../')
var common = require('./common')
var test = require('tape')
// var wrtc = require('electron-webrtc')()
var wrtc = require('electron-webrtc')()

// var wrtcReady = false
// wrtc.electronDaemon.once('ready', function () {
// wrtcReady = true
// })
var wrtcReady = false
wrtc.electronDaemon.once('ready', function () {
wrtcReady = true
})

var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
var peerId = new Buffer('01234567890123456789')
Expand All @@ -31,7 +31,7 @@ function serverTest (t, serverType, serverFamily) {
infoHash: infoHash,
length: torrentLength,
announce: [ announceUrl ]
}/*, { wrtc: wrtc }*/)
}, { wrtc: wrtc })

client1.start()

Expand Down Expand Up @@ -87,7 +87,7 @@ function serverTest (t, serverType, serverFamily) {
infoHash: infoHash,
length: torrentLength,
announce: [ announceUrl ]
}/*, { wrtc: wrtc }*/)
}, { wrtc: wrtc })

client2.start()

Expand All @@ -111,9 +111,10 @@ function serverTest (t, serverType, serverFamily) {
t.equal(data.complete, 0)
t.equal(data.incomplete, 0)

client1.destroy()
server.close()
// if (serverType === 'ws') wrtc.close()
client1.destroy(function () {
server.close()
if (serverType === 'ws') wrtc.close()
})
})
})
})
Expand All @@ -124,16 +125,16 @@ function serverTest (t, serverType, serverFamily) {
})
}

// test('websocket server', function (t) {
// if (wrtcReady) {
// runTest()
// } else {
// wrtc.electronDaemon.once('ready', runTest)
// }
// function runTest () {
// serverTest(t, 'ws', 'inet')
// }
// })
test('websocket server', function (t) {
if (wrtcReady) {
runTest()
} else {
wrtc.electronDaemon.once('ready', runTest)
}
function runTest () {
serverTest(t, 'ws', 'inet')
}
})

test('http ipv4 server', function (t) {
serverTest(t, 'http', 'inet')
Expand Down