Skip to content
This repository
Browse code

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

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

0 comments on commit 70d5a25

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