THRIFT-1659 Bring nodejs default transport in line with Java default transport

diff --git a/test/nodejs/Makefile.am b/test/nodejs/Makefile.am
index 7668039..f796b07 100755 (executable)
--- a/test/nodejs/Makefile.am
+++ b/test/nodejs/Makefile.am
@@ -28,7 +28,7 @@ check: stubs
        fi
        @if which node &> /dev/null ; then \
                echo "   Testing Client/Server"; \
-               timeout -s14 3 $(MAKE) server & \
+               timeout -s14 5 $(MAKE) server & \
                sleep 1; $(MAKE) client; sleep 2; \
        fi
 

diff --git a/test/nodejs/client.js b/test/nodejs/client.js
index 269aab3..d96400e 100644 (file)
--- a/test/nodejs/client.js
+++ b/test/nodejs/client.js
@@ -17,14 +17,14 @@
  * under the License.
  */
 var thrift = require('thrift');
-//var ttransport = require('transport');
+var ttransport = require('transport');
 var assert = require('assert');
 
 var ThriftTest = require('./gen-nodejs/ThriftTest'),
     ttypes = require('./gen-nodejs/ThriftTest_types');
 
-//var connection = thrift.createConnection('localhost', 9090, { 'transport': ttransport.TFramedTransport }),
-var connection = thrift.createConnection('localhost', 9090),
+var connection = thrift.createConnection('localhost', 9090, { 'transport': ttransport.TFramedTransport }),
+//var connection = thrift.createConnection('localhost', 9090),
     client = thrift.createClient(ThriftTest, connection);
 
 connection.on('error', function(err) {
@@ -255,7 +255,7 @@ client.testI32(-1, function(err, response) {
 setTimeout(function() {
   console.log("Server successfully tested!");
   connection.end();
-}, 200);
+}, 1500);
 
 // to make it also run on expresso
 exports.expressoTest = function() {};

diff --git a/test/nodejs/server.js b/test/nodejs/server.js
index 06724e6..28eeeae 100644 (file)
--- a/test/nodejs/server.js
+++ b/test/nodejs/server.js
@@ -18,6 +18,7 @@
  */
 var thrift = require('thrift');
 var Thrift = thrift.Thrift;
+var ttransport = require('transport');
 
 var ThriftTest = require('./gen-nodejs/ThriftTest'),
     ttypes = require('./gen-nodejs/ThriftTest_types');
@@ -214,6 +215,8 @@ var server = thrift.createServer(ThriftTest, {
       console.log('Done sleeping for testOneway!');
     }, sleepFor*1000); //seconds
   }
+}, { //server options
+  'transport': ttransport.TFramedTransport
 });
 
 server.listen(9090);