From 5ac17d3fbf27e5656735c62fc533a4f057f65f29 Mon Sep 17 00:00:00 2001 From: Ryan Bennett Date: Thu, 29 Oct 2015 14:20:36 -0600 Subject: [PATCH] fix thtp tests --- ext/stream.class.js | 2 -- ext/thtp.class.js | 6 +----- test/ext/thtp.test.js | 9 +++------ 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/ext/stream.class.js b/ext/stream.class.js index a9d27b6..58ef720 100644 --- a/ext/stream.class.js +++ b/ext/stream.class.js @@ -62,8 +62,6 @@ ChannelStream.prototype._read = function(size){ ChannelStream.prototype._write = function(data,enc,cbWrite) { - if (!data) - return; if(this._chan.state == 'gone') return cbWrite('closed'); // switch to our default encoding syntax // dynamically detect object streams and change encoding diff --git a/ext/thtp.class.js b/ext/thtp.class.js index 2a7eac0..11c8ec0 100644 --- a/ext/thtp.class.js +++ b/ext/thtp.class.js @@ -71,11 +71,7 @@ function THTP_Response_fromHTTP(req, link, stream){ if (!head) this.writeHead(200); - console.log() - if (data) - stream.end(data, enc, callback); - else - stream.end(); + stream.end(data) }; diff --git a/test/ext/thtp.test.js b/test/ext/thtp.test.js index d7afdfd..fbad086 100644 --- a/test/ext/thtp.test.js +++ b/test/ext/thtp.test.js @@ -85,8 +85,7 @@ describe('telehash/thtp', function(){ meshB.proxy(proxy); // send request and gather response - linkAB.request('/test', function(err, res){ - expect(err).to.not.exist; + linkAB.request('/test', function(res){ res.pipe(concat(function(body){ expect(body.toString()).to.be.equal('test'); done(); @@ -119,8 +118,7 @@ describe('telehash/thtp', function(){ meshB.proxy(proxy); // send request and gather response - linkAB.request('/test', function(err, res){ - expect(err).to.not.exist; + linkAB.request('/test', function(res){ res.pipe(concat(function(body){ fs .createReadStream(__dirname + "/thtp.test.js") @@ -153,8 +151,7 @@ describe('telehash/thtp', function(){ meshB.proxy("http://localhost:9876"); setTimeout(function(){ - linkAB.request("http://localhost:9876/test", function(err, res){ - expect(err).to.not.exist; + linkAB.request("http://localhost:9876/test", function( res){ res.pipe(concat(function(body){ expect(body.toString()).to.be.equal('test'); done();