Update and refactor Selenium Grid code

Author: mdmintz

seleniumbase/utilities/selenium_grid/grid-hub

@@ -52,7 +52,6 @@ case "$1" in
             echo ""
             exit 1
         else
-            # START_HUB_CMD="java -Djava.util.logging.config.file=test/logging.properties -jar ${WEBDRIVER_SERVER_JAR} ${WEBDRIVER_HUB_PARAMS}"
             START_HUB_CMD="java ${VERBOSITY_STRING}-jar ${WEBDRIVER_SERVER_JAR} ${WEBDRIVER_HUB_PARAMS}"
             echo ""
             echo $START_HUB_CMD
@@ -71,8 +70,8 @@ case "$1" in
         echo "Stopping Selenium-WebDriver Grid Hub..."
         if [ -f $WEBDRIVER_HUB_PIDFILE ]; then
             PID=$(cat $WEBDRIVER_HUB_PIDFILE)
-            kill $PID
             rm $WEBDRIVER_HUB_PIDFILE
+            kill $PID
             sleep 1
             if [[ $(ps -A | egrep "^${PID}") ]]; then
                 echo "${FAIL_MSG} Tried to kill the Grid Hub with PID ${PID}, but was unsuccessful. You need to kill it with something stronger, like 'kill -9'"

seleniumbase/utilities/selenium_grid/grid-node

@@ -40,8 +40,7 @@ if [ "$GRID_NODE_VERBOSE_LOGS" == "True" ]; then
 fi
 
 WEBDRIVER_SERVER_JAR=${DIR}/selenium-server-standalone.jar
-# WEBDRIVER_NODE_PARAMS="-role node -hubHost ${GRID_HUB_SERVER_IP} -hubPort 4444 -host 127.0.0.1 -browser browserName=chrome,maxInstances=5,version=ANY,platform=ANY -browser browserName=firefox,maxInstances=5,version=ANY,platform=ANY -browser browserName=MicrosoftEdge,maxInstances=1,version=ANY,platform=WIN10"
-WEBDRIVER_NODE_PARAMS="-role node -hub http://${GRID_HUB_SERVER_IP}:4444/grid/register -browser browserName=chrome,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=MicrosoftEdge,maxInstances=1,version=ANY,platform=WIN10,seleniumProtocol=WebDriver"
+WEBDRIVER_NODE_PARAMS="-role node -hub http://${GRID_HUB_SERVER_IP}:4444/grid/register -browser browserName=chrome,maxInstances=5,version=latest,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=latest,seleniumProtocol=WebDriver"
 WEBDRIVER_NODE_PIDFILE="/tmp/webdriver_node.pid"
 
 if [ ! -f $WEBDRIVER_SERVER_JAR ]; then
@@ -56,7 +55,6 @@ case "$1" in
             echo "${FAIL_MSG} Selenium-WebDriver Grid node already running with PID $(cat $WEBDRIVER_NODE_PIDFILE). Run 'grid-node stop' or 'grid-node restart'."
             exit 1
         else
-            # START_NODE_CMD="java -Djava.util.logging.config.file=test/logging.properties -jar ${WEBDRIVER_SERVER_JAR} ${WEBDRIVER_NODE_PARAMS}"
             START_NODE_CMD="java ${VERBOSITY_STRING}-jar ${WEBDRIVER_SERVER_JAR} ${WEBDRIVER_NODE_PARAMS}"
             echo ""
             echo $START_NODE_CMD
@@ -66,17 +64,15 @@ case "$1" in
             echo $PID > "${WEBDRIVER_NODE_PIDFILE}"
             echo "${SUCCESS_MSG} Selenium-WebDriver Grid node started successfully."
             echo ""
-            echo "Browser Sessions: http://127.0.0.1:5555/wd/hub/static/resource/hub.html"
-            echo ""
             # echo "To see full log output, remove the java.util.logging.config.file parameter from script/grid-node"
         fi
         ;;
     stop)
         echo "Stopping Selenium-WebDriver Grid node..."
         if [ -f $WEBDRIVER_NODE_PIDFILE ]; then
             PID=$(cat $WEBDRIVER_NODE_PIDFILE)
-            kill $PID
             rm $WEBDRIVER_NODE_PIDFILE
+            kill $PID
             sleep 1
             if [[ $(ps -A | egrep "^${PID}") ]]; then
                 echo "${FAIL_MSG} Tried to kill the node with PID ${PID}, but was unsuccessful. You need to kill it with something stronger, like 'kill -9'"

seleniumbase/utilities/selenium_grid/grid_node.py

@@ -115,23 +115,16 @@ def main():
     else:
         if grid_hub_command == "start" or grid_hub_command == "restart":
             shell_command = (
-                """java -jar %s/selenium-server-standalone.jar -role node """
-                """-hub http://%s:4444/grid/register -browser browser"""
-                """Name=chrome,maxInstances=5,version=ANY,seleniumProtocol="""
-                """WebDriver -browser browserName=firefox,maxInstances=5,"""
-                """version=ANY,seleniumProtocol=WebDriver -browser browser"""
-                """Name=MicrosoftEdge,maxInstances=1,version=ANY,"""
-                """platform=WIN10,seleniumProtocol=WebDriver"""
+                """java -jar %s/selenium-server-standalone.jar -role node"""
+                """ -hub http://%s:4444/grid/register -browser browser"""
+                """Name=chrome,maxInstances=5,version=latest,"""
+                """seleniumProtocol=WebDriver -browser browserName=firefox,"""
+                """maxInstances=5,version=latest,seleniumProtocol=WebDriver"""
                 % (dir_path, server_ip)
             )
             print("\nStarting Selenium-WebDriver Grid node...\n")
             print(shell_command)
             print("")
-            print(
-                """Browser Sessions: http://127.0.0.1:5555"""
-                """/wd/hub/static/resource/hub.html"""
-            )
-            print("")
             subprocess.check_call(shell_command, shell=True)
         elif grid_hub_command == "stop":
             print("")

seleniumbase/utilities/selenium_grid/register-grid-node.bat

@@ -1 +1 @@
-java -jar selenium-server-standalone.jar -role node -hub http://127.0.0.1:4444/grid/register -browser browserName=chrome,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=MicrosoftEdge,maxInstances=1,version=ANY,platform=WIN10,seleniumProtocol=WebDriver
+java -jar selenium-server-standalone.jar -role node -hub http://127.0.0.1:4444/grid/register -browser browserName=chrome,maxInstances=5,version=latest,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=latest,seleniumProtocol=WebDriver

seleniumbase/utilities/selenium_grid/register-grid-node.sh

@@ -1,2 +1,2 @@
 #!/bin/bash
-java -jar selenium-server-standalone.jar -role node -hub http://127.0.0.1:4444/grid/register -browser browserName=chrome,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=ANY,seleniumProtocol=WebDriver -browser browserName=MicrosoftEdge,maxInstances=1,version=ANY,platform=WIN10,seleniumProtocol=WebDriver
+java -jar selenium-server-standalone.jar -role node -hub http://127.0.0.1:4444/grid/register -browser browserName=chrome,maxInstances=5,version=latest,seleniumProtocol=WebDriver -browser browserName=firefox,maxInstances=5,version=latest,seleniumProtocol=WebDriver