test_framework
/
SeleniumBase
mirror of https://github.com/seleniumbase/SeleniumBase.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #175 from seleniumbase/small-fixes 

Small fixes
This commit is contained in:
Michael Mintz 2018-07-25 10:16:37 -04:00 committed by GitHub
parent bc822c9c6b 190368e743
commit 8e2022a218
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
console_scripts/run.py
View File

@ -121,7 +121,6 @@ def main():
elif num_args > 2:
command = sys.argv[1]
command_args = sys.argv[2:]
print command
if command == "convert":
if len(command_args) == 1:

2
integrations/selenium_grid/grid-node
View File

@ -66,7 +66,7 @@ case "$1" in
echo $PID > "${WEBDRIVER_NODE_PIDFILE}"
echo "${SUCCESS_MSG} Selenium-WebDriver Grid node started successfully."
echo ""
echo "Browser Sessions: http://${GRID_HUB_SERVER_IP}:5555/wd/hub/static/resource/hub.html"
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

2
integrations/selenium_grid/grid_hub.py
View File

@ -69,6 +69,8 @@ def main():
print("\nStarting Selenium-WebDriver Grid Hub...\n")
print(shell_command)
print("")
print("Grid Hub Console: http://127.0.0.1:4444/grid/console")
print("")
subprocess.check_call(shell_command, shell=True)
elif grid_hub_command == "stop":
print("")

8
integrations/selenium_grid/grid_node.py
View File

@ -76,15 +76,19 @@ def main():
if grid_hub_command == "start" or grid_hub_command == "restart":
shell_command = (
"""java -jar %s/selenium-server-standalone.jar -role node """
"""-hub http://127.0.0.1:4444/grid/register -browser browser"""
"""-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""" % dir_path)
"""platform=WIN10,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("")

2
setup.py
View File

@ -7,7 +7,7 @@ from setuptools import setup, find_packages # noqa
setup(
name='seleniumbase',
version='1.12.0',
version='1.12.1',
description='Web Automation & Testing Framework - http://seleniumbase.com',
long_description='Web Automation and Testing Framework - seleniumbase.com',
platforms='Mac * Windows * Linux * Docker',