BEANSTALK_PORT env, slight change to test helper

pascalopitz · Mar 11, 2013 · c93cc31 · c93cc31
1 parent 5576a7c
commit c93cc31
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/tests/helper.js b/tests/helper.js
@@ -1,7 +1,7 @@
 var bs = require('../lib/beanstalk_client');
 var net = require('net');
 
-var port = process.env.PORT || 11333;
+var port = process.env.BEANSTALK_PORT || 11333;
 
 var mock = process.env.BEANSTALKD !== '1';
 var mock_server;
@@ -11,30 +11,31 @@ var connection;
 module.exports = {
 	bind : function (fn, closeOnEnd) {
 
-		if(mock) {
-			mock_server = net.createServer(function(conn) {
-				connection = conn;
+		if(!mock) {
+			return false;
+		}
 
-				connection.on('data', function (data) {
-					fn.call(mock_server, connection, data);
-				});
+		mock_server = net.createServer(function(conn) {
+			connection = conn;
 
-				if(closeOnEnd === true) {
-					closeOnEnd = function () {
-						mock_server.close();
-					}
-				}
+			connection.on('data', function (data) {
+				fn.call(mock_server, connection, data);
+			});
 
-				if(closeOnEnd) {
-					connection.on('end', function () {
-						closeOnEnd.call(mock_server); 
-					});
+			if(closeOnEnd === true) {
+				closeOnEnd = function () {
+					mock_server.close();
 				}
-			});
+			}
 
-			mock_server.listen(port);
-		}
+			if(closeOnEnd) {
+				connection.on('end', function () {
+					closeOnEnd.call(mock_server); 
+				});
+			}
+		});
 
+		mock_server.listen(port);
 	},
 	getClient : function () {
 		return bs.Client('127.0.0.1:' + port);