add

Author: hankduan

lib/debugger/debuggerCommons.js

@@ -11,24 +11,20 @@ exports.attachDebugger = function(pid, opt_port) {
   var client = new baseDebugger.Client();
   var port = opt_port || process.debugPort;
 
-  // Invoke fn if port is available.
-  var onPortAvailable = function(fn) {
-    var net = require('net');
-    var tester = net.connect({port: port}, function() {
-      console.error('Port ' + port + ' is already in use. Please specify ' + 
-        'another port to debug.');
-      process.exit(1);
-    });
-    tester.once('error', function (err) {
-      if (err.code === 'ECONNREFUSED') {
-        tester.once('close', fn).end();
-      } else {
-        console.error('Unexpected failure testing for port ' + port + ': ', 
-          err);
-        process.exit(1);
-      }
+  // Call this private function instead of sending SIGUSR1 because Windows.
+  process._debugProcess(pid);
+
+  client.once('ready', function() {
+    client.setBreakpoint({
+      type: 'scriptRegExp',
+      target: '.*executors\.js', //jshint ignore:line
+      line: 37
+    }, function() {
+      client.reqContinue(function() {
+        // Intentionally blank.
+      });
     });
-  };
+  });
 
   // Connect to debugger on port with retry 200ms apart.
   var connectWithRetry = function(attempts) {
@@ -43,24 +39,7 @@ exports.attachDebugger = function(pid, opt_port) {
           }
         });
   };
-  
-  onPortAvailable(function() {
-    // Call this private function instead of sending SIGUSR1 because Windows.
-    process._debugProcess(pid);
-
-    client.once('ready', function() {
-      client.setBreakpoint({
-        type: 'scriptRegExp',
-        target: '.*executors\.js', //jshint ignore:line
-        line: 37
-      }, function() {
-        client.reqContinue(function() {
-          // Intentionally blank.
-        });
-      });
-    });
-    connectWithRetry(10);
-  });
+  connectWithRetry(10);
 
   return client;
 };

lib/protractor.js

@@ -653,6 +653,26 @@ Protractor.prototype.initDebugger_ = function(debuggerClientPath, opt_debugPort)
     return asString;
   };
 
+  // Return a promise that resolves to whether the port is available.
+  var checkPortAvailability = function(port) {
+    var net = require('net');
+    var deferred = webdriver.promise.defer();
+    var tester = net.connect({port: port}, function() {
+      deferred.reject('Port ' + port + ' is already in use.');
+    });
+    tester.once('error', function (err) {
+      if (err.code === 'ECONNREFUSED') {
+        tester.once('close', function() {
+          deferred.fulfill();
+        }).end();
+      } else {
+        deferred.reject('Unexpected failure testing for port ' + port + ': ' + 
+          err.message);
+      }
+    });
+    return deferred.promise;
+  };
+
   var vm_ = require('vm');
   var browserUnderDebug = this;
   var flow = webdriver.promise.controlFlow();
@@ -661,11 +681,13 @@ Protractor.prototype.initDebugger_ = function(debuggerClientPath, opt_debugPort)
     log.puts('Starting WebDriver debugger in a child process. Pause is ' +
         'still beta, please report issues at github.com/angular/protractor\n');
     process.debugPort = opt_debugPort || process.debugPort;
-    var nodedebug = require('child_process').
-        fork(debuggerClientPath, [process.pid, process.debugPort]);
-    process.on('exit', function() {
-      nodedebug.kill('SIGTERM');
-    });    
+    return checkPortAvailability(process.debugPort).then(function() {
+      var nodedebug = require('child_process').fork(
+          debuggerClientPath, [process.pid, process.debugPort]);
+      process.on('exit', function() {
+        nodedebug.kill('SIGTERM');
+      }); 
+    });
   });
 
   var pausePromise = flow.timeout(1000, 'waiting for debugger to attach')