Skip to content
Browse files

Use 4444 for API default port, 3333 for test default, random for others

  • Loading branch information...
1 parent bba475d commit 70d5a25434ee8c9ead4192e10d7a50dc03f2576f @semperos committed Aug 15, 2012
View
3 script/grid-hub
@@ -21,7 +21,8 @@ fi
################################################################################
WEBDRIVER_SERVER_JAR=/opt/selenium-server-standalone.jar
-WEBDRIVER_HUB_PARAMS="-role hub -port 3003"
+# API default is 4444, so for testing we'll use 3333
+WEBDRIVER_HUB_PARAMS="-role hub -port 3333"
WEBDRIVER_HUB_PIDFILE="/tmp/webdriver_hub.pid"
if [ ! -f $WEBDRIVER_SERVER_JAR ]; then
View
3 script/grid-node
@@ -21,7 +21,8 @@ fi
################################################################################
WEBDRIVER_SERVER_JAR=/opt/selenium-server-standalone.jar
-WEBDRIVER_NODE_PARAMS="-role node -hubHost 127.0.0.1 -hubPort 3003"
+# API default is 4444, so for testing we'll use 3333
+WEBDRIVER_NODE_PARAMS="-role node -hubHost 127.0.0.1 -hubPort 3333"
WEBDRIVER_NODE_PIDFILE="/tmp/webdriver_node.pid"
if [ ! -f $WEBDRIVER_SERVER_JAR ]; then
View
6 script/test
@@ -21,8 +21,8 @@ fi
################################################################################
GRID_HOST_DEFAULT=127.0.0.1
-# 3001 is default for regular API, so for testing we'll default to 3003
-GRID_PORT_DEFAULT=3003
+# API default is 4444, so for testing we'll use 3333
+GRID_PORT_DEFAULT=3333
DO_testCore() {
if [ $2 == "single" ]; then
@@ -44,7 +44,7 @@ DO_testRemote() {
if [ -z $WEBDRIVER_GRID_PORT ]; then
export WEBDRIVER_GRID_PORT="${GRID_PORT_DEFAULT}"
fi
- lein test clj-webdriver.test.remote-manual
+ lein test clj-webdriver.test.remote-existing
lein test clj-webdriver.test.remote
lein test clj-webdriver.test.wire
}
View
4 test/clj_webdriver/test/remote.clj
@@ -9,8 +9,8 @@
(:require
[clj-webdriver.remote.driver :as rd]))
-;; Use port 3004 so we can run this and the remote-manual test without interruption
-(let [[this-server this-driver] (new-remote-session {:port 3004} {:browser :firefox})]
+;; Non-standard port to avoid conflicts
+(let [[this-server this-driver] (new-remote-session {:port 3003} {:browser :firefox})]
(def server this-server)
(def driver this-driver))
View
5 test/clj_webdriver/test/remote_existing.clj
@@ -16,8 +16,9 @@
(defn hub-port
[]
- ;; 3001 is default for regular API, so for testing we'll default to 3003
- (int (get (System/getenv) "WEBDRIVER_HUB_PORT" 3003)))
+ ;; API default is 4444, so for testing we use 3333
+ ;; see scripts/grid-hub and scripts/grid-node
+ (int (get (System/getenv) "WEBDRIVER_HUB_PORT" 3333)))
(let [[this-server this-driver] (new-remote-session {:port (hub-port)
:host (hub-host)
View
3 test/clj_webdriver/test/wire.clj
@@ -8,7 +8,8 @@
[clj-webdriver.remote.driver :only [session-id]]
[clj-webdriver.wire :only [execute]]))
-(let [[this-server this-driver] (new-remote-session {:port 3003} {:browser :firefox})]
+;; Non-standard port to avoid conflicts
+(let [[this-server this-driver] (new-remote-session {:port 3004} {:browser :firefox})]
(def server this-server)
(def driver this-driver))

0 comments on commit 70d5a25

Please sign in to comment.
Something went wrong with that request. Please try again.