Skip to content

Small fixes #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jul 25, 2018
Merged

Small fixes #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
97fa148
Remove a debug statement that breaks Python 3 runs
mdmintz Jul 25, 2018
1551550
Fix Grid node shell command to connect to correct Grid Hub
mdmintz Jul 25, 2018
ddf504d
Update Selenium Grid logging output
mdmintz Jul 25, 2018
190368e
Version 1.12.1
mdmintz Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion console_scripts/run.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion integrations/selenium_grid/grid-node
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions integrations/selenium_grid/grid_hub.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
8 changes: 6 additions & 2 deletions integrations/selenium_grid/grid_node.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("")
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

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',
Expand Down