Completely remove Selenium IDE support, i.e. RC_CHROME / RC_FIREFOX

Author: elgalu

CHANGELOG.md

@@ -9,8 +9,10 @@ Note image ids also change after scm-source.json has being updated which trigger
 
 ## TBD_DOCKER_TAG
  + **Changes:** https://github.com/elgalu/docker-selenium/compare/659750865bf0fd569d...master (TBD_DATE)
-     + BREAKING CHANGE: Drop support for Selenium 2
-         From now on we will show a banner and switch directly to selenium 3
+     + BREAKING CHANGES:
+         ++ Drop support for Selenium 2
+         ++ From now on we will show a banner and switch directly to selenium 3
+         ++ Completely remove Selenium IDE support, i.e. RC_CHROME / RC_FIREFOX
      + Upgrade Ubuntu xenial-20170410 to 20170510
      + wait_all_done was failing in some cases, closes #156
      + When using with Zalenium do not killall when noVNC fails

Dockerfile

@@ -682,8 +682,6 @@ COPY ./dns/etc/hosts /tmp/hosts
 ENV DEFAULT_SELENIUM_HUB_PORT="24444" \
     DEFAULT_SELENIUM_NODE_CH_PORT="25550" \
     DEFAULT_SELENIUM_NODE_FF_PORT="25551" \
-    DEFAULT_SELENIUM_NODE_RC_CH_PORT="25552" \
-    DEFAULT_SELENIUM_NODE_RC_FF_PORT="25553" \
     DEFAULT_VNC_PORT="25900" \
     DEFAULT_NOVNC_PORT="26080" \
     DEFAULT_SUPERVISOR_HTTP_PORT="19001"
@@ -845,8 +843,6 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   SELENIUM_NODE_HOST="127.0.0.1" \
   SELENIUM_NODE_CH_PORT="${DEFAULT_SELENIUM_NODE_CH_PORT}" \
   SELENIUM_NODE_FF_PORT="${DEFAULT_SELENIUM_NODE_FF_PORT}" \
-  SELENIUM_NODE_RC_CH_PORT="${DEFAULT_SELENIUM_NODE_RC_CH_PORT}" \
-  SELENIUM_NODE_RC_FF_PORT="${DEFAULT_SELENIUM_NODE_RC_FF_PORT}" \
   SELENIUM_HUB_PARAMS="" \
   SELENIUM_NODE_PARAMS="" \
   SELENIUM_NODE_PROXY_PARAMS="" \
@@ -895,8 +891,6 @@ ENV FIREFOX_VERSION="${FF_VER}" \
   GRID="true" \
   CHROME="true" \
   FIREFOX="true" \
-  RC_CHROME="false" \
-  RC_FIREFOX="false" \
   FFMPEG_FRAME_RATE=10 \
   FFMPEG_CODEC_ARGS="-crf 0 -preset ultrafast -qp 0" \
   FFMPEG_FINAL_CRF=0 \

README.md

@@ -400,10 +400,6 @@ Powered by Supervisor, the container leaves many logs;
     /var/log/cont/selenium-node-chrome-stdout.log
     /var/log/cont/selenium-node-firefox-stderr.log
     /var/log/cont/selenium-node-firefox-stdout.log
-    /var/log/cont/selenium-rc-chrome-stderr.log
-    /var/log/cont/selenium-rc-chrome-stdout.log
-    /var/log/cont/selenium-rc-firefox-stderr.log
-    /var/log/cont/selenium-rc-firefox-stdout.log
     /var/log/cont/supervisord.log
     /var/log/cont/video-rec-stderr.log
     /var/log/cont/video-rec-stdout.log

bin/entry.sh

@@ -34,8 +34,6 @@ stop >/dev/null 2>&1 || true
 rm -f ${LOGS_DIR}/*
 rm -f ${RUN_DIR}/*
 
-export RC_CHROME="false"
-export RC_FIREFOX="false"
 # Support restart docker container for selenium 3 @aituganov
 if [ ! -f /usr/bin/geckodriver ]; then
   sudo mv /opt/geckodriver /usr/bin/geckodriver
@@ -46,11 +44,6 @@ sudo cp /capabilities3.json /capabilities.json
 sudo cp /capabilities3.json /home/seluser/capabilities.json
 sudo cp /capabilities3.json /home/seluser/caps.json
 
-# We need larger screens for Selenium IDE RC tests
-# if [ "${RC_CHROME}" = "true" ] || [ "${RC_FIREFOX}" = "true" ]; then
-#   export SCREEN_HEIGHT=$((SCREEN_HEIGHT*2))
-# fi
-
 #---------------------
 # Fix/extend ENV vars
 #---------------------
@@ -157,14 +150,6 @@ if [ "${FIREFOX}" = "true" ]; then
   export SUPERVISOR_REQUIRED_SRV_LIST="${SUPERVISOR_REQUIRED_SRV_LIST}|selenium-node-firefox"
 fi
 
-if [ "${RC_CHROME}" = "true" ]; then
-  export SUPERVISOR_REQUIRED_SRV_LIST="${SUPERVISOR_REQUIRED_SRV_LIST}|selenium-rc-chrome"
-fi
-
-if [ "${RC_FIREFOX}" = "true" ]; then
-  export SUPERVISOR_REQUIRED_SRV_LIST="${SUPERVISOR_REQUIRED_SRV_LIST}|selenium-rc-firefox"
-fi
-
 if [ "${SELENIUM_HUB_PORT}" = "" ]; then
   echo "FATAL: SELENIUM_HUB_PORT is empty but should be a number" 1>&2
   exit 120
@@ -219,24 +204,6 @@ elif [ "${PICK_ALL_RANDOM_PORTS}" = "true" ]; then
   fi
 fi
 
-if [ "${SELENIUM_NODE_RC_CH_PORT}" = "0" ]; then
-  export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
-elif [ "${PICK_ALL_RANDOM_PORTS}" = "true" ]; then
-  # User want to pick random ports but may also want to fix some others
-  if [ "${SELENIUM_NODE_RC_CH_PORT}" = "${DEFAULT_SELENIUM_NODE_RC_CH_PORT}" ]; then
-    export SELENIUM_NODE_RC_CH_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
-  fi
-fi
-
-if [ "${SELENIUM_NODE_RC_FF_PORT}" = "0" ]; then
-  export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
-elif [ "${PICK_ALL_RANDOM_PORTS}" = "true" ]; then
-  # User want to pick random ports but may also want to fix some others
-  if [ "${SELENIUM_NODE_RC_FF_PORT}" = "${DEFAULT_SELENIUM_NODE_RC_FF_PORT}" ]; then
-    export SELENIUM_NODE_RC_FF_PORT=$(get_unused_port_from_range ${RANDOM_PORT_FROM} ${RANDOM_PORT_TO})
-  fi
-fi
-
 # Video
 export VIDEO_LOG_FILE="${LOGS_DIR}/video-rec-stdout.log"
 export VIDEO_PIDFILE="${RUN_DIR}/video.pid"
@@ -332,8 +299,6 @@ ga_track_start () {
     START_META_DATA="${START_META_DATA} SELENIUM_NODE_HOST='${SELENIUM_NODE_HOST}'"
     START_META_DATA="${START_META_DATA} SELENIUM_HUB_PARAMS='${SELENIUM_HUB_PARAMS}'"
     START_META_DATA="${START_META_DATA} SELENIUM_NODE_PARAMS='${SELENIUM_NODE_PARAMS}'"
-    START_META_DATA="${START_META_DATA} RC_CHROME='${RC_CHROME}'"
-    START_META_DATA="${START_META_DATA} RC_FIREFOX='${RC_FIREFOX}'"
     START_META_DATA="${START_META_DATA} MEM_JAVA_PERCENT='${MEM_JAVA_PERCENT}'"
     START_META_DATA="${START_META_DATA} WAIT_TIMEOUT='${WAIT_TIMEOUT}'"
     START_META_DATA="${START_META_DATA} WAIT_FOREGROUND_RETRY='${WAIT_FOREGROUND_RETRY}'"
@@ -548,10 +513,6 @@ echo "${SELENIUM_NODE_CH_PORT}" > SELENIUM_NODE_CH_PORT
 echo "${SELENIUM_NODE_CH_PORT}" > CH_PORT
 echo "${SELENIUM_NODE_FF_PORT}" > SELENIUM_NODE_FF_PORT
 echo "${SELENIUM_NODE_FF_PORT}" > FF_PORT
-echo "${SELENIUM_NODE_RC_CH_PORT}" > SELENIUM_NODE_RC_CH_PORT
-echo "${SELENIUM_NODE_RC_CH_PORT}" > RC_CH_PORT
-echo "${SELENIUM_NODE_RC_FF_PORT}" > SELENIUM_NODE_RC_FF_PORT
-echo "${SELENIUM_NODE_RC_FF_PORT}" > RC_FF_PORT
 echo "${VNC_PORT}" > VNC_PORT
 echo "${NOVNC_PORT}" > NOVNC_PORT
 echo "${SUPERVISOR_HTTP_PORT}" > SUPERVISOR_HTTP_PORT
@@ -564,8 +525,6 @@ echo "${CHROME_VERSION}" > CHROME_VERSION
 echo "${CHROME}" > CHROME
 echo "${CHROME_FLAVOR}" > CHROME_FLAVOR
 echo "${FIREFOX}" > FIREFOX
-echo "${RC_CHROME}" > RC_CHROME
-echo "${RC_FIREFOX}" > RC_FIREFOX
 echo "${WAIT_TIMEOUT}" > WAIT_TIMEOUT
 echo "${COMMON_CAPS}" > COMMON_CAPS
 echo "${SELENIUM_HUB_HOST}" > SELENIUM_HUB_HOST

mk/move.sh

@@ -29,12 +29,6 @@ if [ "${browser}" = "chrome" ] && [ "${node}" = "1" ]; then
 elif [ "${browser}" = "firefox" ] && [ "${node}" = "1" ]; then
   # NorthEast(3)1920,0
   set -x && wmctrl -r "${WIN_TITLE}" -e 3,1920,0,-1,-1
-elif [ "${browser}" = "rc_chrome" ] && [ "${node}" = "1" ]; then
-  # SouthEast(9)1920,1080
-  set -x && wmctrl -r "${WIN_TITLE}" -e 9,1920,1080,-1,-1
-elif [ "${browser}" = "rc_firefox" ] && [ "${node}" = "1" ]; then
-  # SouthWest(7)0,1080
-  set -x && wmctrl -r "${WIN_TITLE}" -e 7,0,1080,-1,-1
 else
   # TODO: make it smarter
   echo "-- TODO: Sorry I still don't know where to move ${browser} node: ${node}"