selenium-webdriver 2.47.0 → 2.52.0

package/net/portprober.js

@@ -21,7 +21,7 @@ var exec = require('child_process').exec,
     fs = require('fs'),
     net = require('net');
 
-var promise = require('../index').promise;
+var promise = require('../lib/promise');
 
 
 /**
@@ -36,7 +36,7 @@ var DEFAULT_IANA_RANGE = {min: 49152, max: 65535};
 /**
  * The epheremal port range for the current system. Lazily computed on first
  * access.
- * @type {webdriver.promise.Promise.<{min: number, max: number}>}
+ * @type {promise.Promise.<{min: number, max: number}>}
  */
 var systemRange = null;
 
@@ -44,7 +44,7 @@ var systemRange = null;
 /**
  * Computes the ephemeral port range for the current system. This is based on
  * http://stackoverflow.com/a/924337.
- * @return {webdriver.promise.Promise.<{min: number, max: number}>} A promise
+ * @return {promise.Promise.<{min: number, max: number}>} A promise
  *     that will resolve to the ephemeral port range of the current system.
  */
 function findSystemPortRange() {
@@ -62,7 +62,7 @@ function findSystemPortRange() {
 /**
  * Executes a command and returns its output if it succeeds.
  * @param {string} cmd The command to execute.
- * @return {!webdriver.promise.Promise.<string>} A promise that will resolve
+ * @return {!promise.Promise.<string>} A promise that will resolve
  *     with the command's stdout data.
  */
 function execute(cmd) {
@@ -80,7 +80,7 @@ function execute(cmd) {
 
 /**
  * Computes the ephemeral port range for a Unix-like system.
- * @return {!webdriver.promise.Promise.<{min: number, max: number}>} A promise
+ * @return {!promise.Promise.<{min: number, max: number}>} A promise
  *     that will resolve with the ephemeral port range on the current system.
  */
 function findUnixPortRange() {
@@ -107,7 +107,7 @@ function findUnixPortRange() {
 
 /**
  * Computes the ephemeral port range for a Windows system.
- * @return {!webdriver.promise.Promise.<{min: number, max: number}>} A promise
+ * @return {!promise.Promise.<{min: number, max: number}>} A promise
  *     that will resolve with the ephemeral port range on the current system.
  */
 function findWindowsPortRange() {
@@ -148,12 +148,16 @@ function findWindowsPortRange() {
  * @param {number} port The port to test.
  * @param {string=} opt_host The bound host to test the {@code port} against.
  *     Defaults to {@code INADDR_ANY}.
- * @return {!webdriver.promise.Promise.<boolean>} A promise that will resolve
+ * @return {!promise.Promise.<boolean>} A promise that will resolve
  *     with whether the port is free.
  */
 function isFree(port, opt_host) {
-  var result = promise.defer(function() {
-    server.cancel();
+  var result = promise.defer();
+
+  result.promise.thenCatch(function(e) {
+    if (e instanceof promise.CancellationError) {
+      server.close();
+    }
   });
 
   var server = net.createServer().on('error', function(e) {
@@ -177,7 +181,7 @@ function isFree(port, opt_host) {
 /**
  * @param {string=} opt_host The bound host to test the {@code port} against.
  *     Defaults to {@code INADDR_ANY}.
- * @return {!webdriver.promise.Promise.<number>} A promise that will resolve
+ * @return {!promise.Promise.<number>} A promise that will resolve
  *     to a free port. If a port cannot be found, the promise will be
  *     rejected.
  */
@@ -212,4 +216,4 @@ function findFreePort(opt_host) {
 
 
 exports.findFreePort = findFreePort;
-exports.isFree = isFree;
+exports.isFree = isFree;