Re-enabled wrtc server tests, using SIGKILL to ensure Electron daemon gets killed

This commit is contained in:
Matt Bell 2016-03-25 00:34:37 -07:00
parent 7524131f0d
commit 7369b6b900

View File

@ -1,12 +1,12 @@
var Client = require('../') var Client = require('../')
var common = require('./common') var common = require('./common')
var test = require('tape') var test = require('tape')
// var wrtc = require('electron-webrtc')() var wrtc = require('electron-webrtc')()
// var wrtcReady = false var wrtcReady = false
// wrtc.electronDaemon.once('ready', function () { wrtc.electronDaemon.once('ready', function () {
// wrtcReady = true wrtcReady = true
// }) })
var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705' var infoHash = '4cb67059ed6bd08362da625b3ae77f6f4a075705'
var peerId = new Buffer('01234567890123456789') var peerId = new Buffer('01234567890123456789')
@ -31,7 +31,7 @@ function serverTest (t, serverType, serverFamily) {
infoHash: infoHash, infoHash: infoHash,
length: torrentLength, length: torrentLength,
announce: [ announceUrl ] announce: [ announceUrl ]
}/*, { wrtc: wrtc }*/) }, { wrtc: wrtc })
client1.start() client1.start()
@ -87,7 +87,7 @@ function serverTest (t, serverType, serverFamily) {
infoHash: infoHash, infoHash: infoHash,
length: torrentLength, length: torrentLength,
announce: [ announceUrl ] announce: [ announceUrl ]
}/*, { wrtc: wrtc }*/) }, { wrtc: wrtc })
client2.start() client2.start()
@ -113,7 +113,7 @@ function serverTest (t, serverType, serverFamily) {
client1.destroy() client1.destroy()
server.close() server.close()
// if (serverType === 'ws') wrtc.close() if (serverType === 'ws') wrtc.close('SIGKILL')
}) })
}) })
}) })
@ -124,16 +124,16 @@ function serverTest (t, serverType, serverFamily) {
}) })
} }
// test('websocket server', function (t) { test('websocket server', function (t) {
// if (wrtcReady) { if (wrtcReady) {
// runTest() runTest()
// } else { } else {
// wrtc.electronDaemon.once('ready', runTest) wrtc.electronDaemon.once('ready', runTest)
// } }
// function runTest () { function runTest () {
// serverTest(t, 'ws', 'inet') serverTest(t, 'ws', 'inet')
// } }
// }) })
test('http ipv4 server', function (t) { test('http ipv4 server', function (t) {
serverTest(t, 'http', 'inet') serverTest(t, 'http', 'inet')