From 8c1bb8eafebd72121535a0fa20a13ecba77ce6fa Mon Sep 17 00:00:00 2001 From: Varun Garg Date: Fri, 1 Mar 2019 17:15:51 +0530 Subject: [PATCH 1/3] Selenium 4 changes Signed-off-by: Varun Garg --- google-search-browserstack.py | 19 +++++++- nose-test/google-search-browserstack.py | 22 +++++++-- parallel_tests/README.md | 19 +------- parallel_tests/browsers.json | 61 +++++++++++++------------ parallel_tests/test.py | 21 +++------ py.test/google-search-browserstack.py | 31 +++++++++---- unittest/google-search-browserstack.py | 20 ++++++-- 7 files changed, 115 insertions(+), 78 deletions(-) diff --git a/google-search-browserstack.py b/google-search-browserstack.py index 005cb5a..738451b 100644 --- a/google-search-browserstack.py +++ b/google-search-browserstack.py @@ -7,16 +7,31 @@ try: USERNAME = os.environ.get('BROWSERSTACK_USERNAME') or sys.argv[1] - BROWSERSTACK_ACCESS_KEY = os.environ.get('BROWSERSTACK_ACCESS_KEY') or sys.argv[2] + BROWSERSTACK_ACCESS_KEY = os.environ.get( + 'BROWSERSTACK_ACCESS_KEY') or sys.argv[2] except IndexError: print("Pleaes provide the username and browserstack access key as command line arguments.") sys.exit(1) +capabilities = { + 'browserName': 'Firefox', + 'browserVersion': '65.0', + 'browserstack.use_w3c': 'true', + 'bstack:options': { + 'os': 'Windows', + 'buildName': 'automate-python-samples', + 'osVersion': '10', + 'sessionName': 'single_test', + 'projectName': 'Sample project', + 'debug': 'true' + } +} + driver = webdriver.Remote( command_executor='http://%s:%s@hub.browserstack.com/wd/hub' % ( USERNAME, BROWSERSTACK_ACCESS_KEY ), - desired_capabilities=DesiredCapabilities.FIREFOX + desired_capabilities = capabilities ) driver.get("http://www.google.com") diff --git a/nose-test/google-search-browserstack.py b/nose-test/google-search-browserstack.py index b82b4ae..1c7e9ab 100644 --- a/nose-test/google-search-browserstack.py +++ b/nose-test/google-search-browserstack.py @@ -8,21 +8,35 @@ # Edit these to match your credentials USERNAME = os.environ.get('BROWSERSTACK_USERNAME') or sys.argv[3] -BROWSERSTACK_ACCESS_KEY = os.environ.get('BROWSERSTACK_ACCESS_KEY') or sys.argv[4] +BROWSERSTACK_ACCESS_KEY = os.environ.get( + 'BROWSERSTACK_ACCESS_KEY') or sys.argv[4] if not (USERNAME and BROWSERSTACK_ACCESS_KEY): raise Exception("Please provide your BrowserStack username and access key") + class PythonOrgSearch(unittest.TestCase): def setUp(self): - url = "http://%s:%s@hub.browserstack.com/wd/hub" %( + url = "http://%s:%s@hub.browserstack.com/wd/hub" % ( USERNAME, BROWSERSTACK_ACCESS_KEY ) - + capabilities = { + 'browserName': 'Firefox', + 'browserVersion': '65.0', + 'browserstack.use_w3c': 'true', + 'bstack:options': { + 'os': 'Windows', + 'buildName': 'automate-python-samples', + 'osVersion': '10', + 'sessionName': 'nose_test', + 'projectName': 'Sample project', + 'debug': 'true' + } + } self.driver = webdriver.Remote( command_executor=url, - desired_capabilities=DesiredCapabilities.FIREFOX + desired_capabilities=capabilities ) def test_search_in_python_org(self): diff --git a/parallel_tests/README.md b/parallel_tests/README.md index 04260ba..22ac72b 100644 --- a/parallel_tests/README.md +++ b/parallel_tests/README.md @@ -4,24 +4,9 @@ This project contains 3 files. Each of the files is described below. `browsers.json` - This file specifies the browser capabilites for the tests. Here, each test would be run in these two browsers. - [ - { - "browserName": "iPhone", - "platform": "MAC", - "device": "iPhone 5" - }, - { - "browser": "firefox", - "browser_version": "17.0", - "os": "Windows", - "os_version": "8" - } - ] +`python test.py ` - This file contains the selenium test which would be run in each of the browsers specificed by "browsers.json". - -`test.py ` - This file contains the selenium test which would be run in each of the browsers specificed by "browsers.json". - -`run_parallel_tests.py ` - This is the runner which runs the tests in parallel. +`python run_parallel_tests.py ` - This is the runner which runs the tests in parallel. To run the tests in parallel execute the following command: diff --git a/parallel_tests/browsers.json b/parallel_tests/browsers.json index d501620..2e4d7d4 100644 --- a/parallel_tests/browsers.json +++ b/parallel_tests/browsers.json @@ -1,37 +1,40 @@ [ { - "browserName": "iPhone", - "platform": "MAC", - "device": "iPhone 5" + "browserName": "Firefox", + "browserVersion": "42.0", + "browserstack.use_w3c": true, + "bstack:options": { + "os": "OS X", + "osVersion": "Snow Leopard", + "sessionName": "parallel_test", + "buildName": "automate-python-samples", + "projectName": "Sample Project", + "debug": true + } }, { - "browser": "firefox", - "browser_version": "17.0", - "os": "Windows", - "os_version": "8" + "browserName": "Internet Explorer", + "browserVersion": "10", + "browserstack.use_w3c": true, + "bstack:options": { + "os": "Windows", + "sessionName": "parallel_test", + "buildName": "automate-python-samples", + "projectName": "Sample Project", + "debug": true + } }, { - "browser": "ie", - "browser_version": "8.0", - "os": "Windows", - "os_version": "7" - }, - { - "browser": "ie", - "browser_version": "9.0", - "os": "Windows", - "os_version": "7" - }, - { - "browser": "ie", - "browser_version": "10.0", - "os": "Windows", - "os_version": "8" - }, - { - "browser": "firefox", - "browser_version": "15.0", - "os": "OS X", - "os_version": "Snow Leopard" + "browserName": "Chrome", + "browserVersion": "70.0", + "browserstack.use_w3c": true, + "bstack:options": { + "os": "Windows", + "osVersion": "7", + "sessionName": "parallel_test", + "buildName": "automate-python-samples", + "projectName": "Sample Project", + "debug": true + } } ] diff --git a/parallel_tests/test.py b/parallel_tests/test.py index fa7708a..b93db97 100644 --- a/parallel_tests/test.py +++ b/parallel_tests/test.py @@ -1,26 +1,19 @@ from selenium import webdriver -import os, sys, json +import os +import sys +import json json_name = sys.argv[1] USERNAME = os.environ.get('BROWSERSTACK_USERNAME') or sys.argv[2] -BROWSERSTACK_ACCESS_KEY = os.environ.get('BROWSERSTACK_ACCESS_KEY') or sys.argv[3] +BROWSERSTACK_ACCESS_KEY = os.environ.get( + 'BROWSERSTACK_ACCESS_KEY') or sys.argv[3] with open(json_name, "r") as f: obj = json.loads(f.read()) -instance_caps= obj[int(sys.argv[2])] +caps = obj[int(sys.argv[2])] print "Test "+sys.argv[2]+" started" -#------------------------------------------------------# -# Mention any other capabilities required in the test -caps = {} -caps["browserstack.debug"] = "true" -caps["build"] = "parallel tests" - -#------------------------------------------------------# - -caps = dict(caps.items() + instance_caps.items()) - #------------------------------------------------------# # THE TEST TO BE RUN PARALLELY GOES HERE @@ -36,4 +29,4 @@ inputElement.submit() print driver.title driver.quit() -#------------------------------------------------------# \ No newline at end of file +#------------------------------------------------------# diff --git a/py.test/google-search-browserstack.py b/py.test/google-search-browserstack.py index 0a93724..e51a4a4 100644 --- a/py.test/google-search-browserstack.py +++ b/py.test/google-search-browserstack.py @@ -6,22 +6,37 @@ # Edit these to match your credentials USERNAME = os.environ.get('BROWSERSTACK_USERNAME') or sys.argv[1] -BROWSERSTACK_ACCESS_KEY = os.environ.get('BROWSERSTACK_ACCESS_KEY') or sys.argv[2] +BROWSERSTACK_ACCESS_KEY = os.environ.get( + 'BROWSERSTACK_ACCESS_KEY') or sys.argv[2] if not (USERNAME and BROWSERSTACK_ACCESS_KEY): raise Exception("Please provide your BrowserStack username and access key") + def test_run(): - url = "http://%s:%s@hub.browserstack.com/wd/hub" %( + url = "http://%s:%s@hub.browserstack.com/wd/hub" % ( USERNAME, BROWSERSTACK_ACCESS_KEY ) - - driver = webdriver.Remote(command_executor=url, desired_capabilities=DesiredCapabilities.FIREFOX) + capabilities = { + 'browserName': 'Firefox', + 'browserVersion': '65.0', + 'browserstack.use_w3c': 'true', + 'bstack:options': { + 'os': 'Windows', + 'buildName': 'automate-python-samples', + 'osVersion': '10', + 'sessionName': 'unittest_single_test', + 'projectName': 'Sample project', + 'debug': 'true' + } + } + driver = webdriver.Remote(command_executor=url, + desired_capabilities=capabilities) driver.get('http://www.google.com') if not "Google" in driver.title: raise Exception("Are you not on google? How come!") - elem = driver.find_element_by_name("q") - elem.send_keys("selenium") - elem.submit() - driver.quit() + elem = driver.find_element_by_name("q") + elem.send_keys("selenium") + elem.submit() + driver.quit() diff --git a/unittest/google-search-browserstack.py b/unittest/google-search-browserstack.py index 8695749..bf6fc07 100644 --- a/unittest/google-search-browserstack.py +++ b/unittest/google-search-browserstack.py @@ -19,10 +19,22 @@ def setUp(self): url = "http://%s:%s@hub.browserstack.com/wd/hub" %( USERNAME, BROWSERSTACK_ACCESS_KEY ) - + capabilities = { + 'browserName': 'Firefox', + 'browserVersion': '65.0', + 'browserstack.use_w3c': 'true', + 'bstack:options': { + 'os': 'Windows', + 'buildName': 'automate-python-samples', + 'osVersion': '10', + 'sessionName': 'unittest_single_test', + 'projectName': 'Sample project', + 'debug': 'true' + } + } self.driver = webdriver.Remote( command_executor=url, - desired_capabilities=DesiredCapabilities.FIREFOX + desired_capabilities=capabilities ) def test_search_in_python_org(self): @@ -33,8 +45,8 @@ def test_search_in_python_org(self): elem.submit() self.assertIn("Google", driver.title) - def tearDown(self): - self.driver.quit() + def tearDown(self): + self.driver.quit() if __name__ == "__main__": unittest.main(argv=sys.argv[:1]) From e799b12506c8448cee2069ada5eb6aabfa467216 Mon Sep 17 00:00:00 2001 From: francisf Date: Tue, 5 Mar 2019 11:57:34 +0530 Subject: [PATCH 2/3] Apply suggestions from code review Co-Authored-By: Varun-garg --- .vscode/settings.json | 2 +- google-search-browserstack.py | 2 +- nose-test/google-search-browserstack.py | 2 +- parallel_tests/test.py | 2 +- py.test/google-search-browserstack.py | 2 +- unittest/google-search-browserstack.py | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 4e1520b..67c7ba9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,4 +1,4 @@ { "python.linting.pylintEnabled": true, "python.pythonPath": "/usr/local/bin/python" -} \ No newline at end of file +} diff --git a/google-search-browserstack.py b/google-search-browserstack.py index 738451b..6801532 100644 --- a/google-search-browserstack.py +++ b/google-search-browserstack.py @@ -28,7 +28,7 @@ } driver = webdriver.Remote( - command_executor='http://%s:%s@hub.browserstack.com/wd/hub' % ( + command_executor='https://%s:%s@hub.browserstack.com/wd/hub' % ( USERNAME, BROWSERSTACK_ACCESS_KEY ), desired_capabilities = capabilities diff --git a/nose-test/google-search-browserstack.py b/nose-test/google-search-browserstack.py index 1c7e9ab..3e99dd7 100644 --- a/nose-test/google-search-browserstack.py +++ b/nose-test/google-search-browserstack.py @@ -18,7 +18,7 @@ class PythonOrgSearch(unittest.TestCase): def setUp(self): - url = "http://%s:%s@hub.browserstack.com/wd/hub" % ( + url = "https://%s:%s@hub.browserstack.com/wd/hub" % ( USERNAME, BROWSERSTACK_ACCESS_KEY ) capabilities = { diff --git a/parallel_tests/test.py b/parallel_tests/test.py index b93db97..765101a 100644 --- a/parallel_tests/test.py +++ b/parallel_tests/test.py @@ -18,7 +18,7 @@ # THE TEST TO BE RUN PARALLELY GOES HERE driver = webdriver.Remote( - command_executor='http://%s:%s@hub.browserstack.com/wd/hub' % ( + command_executor='https://%s:%s@hub.browserstack.com/wd/hub' % ( USERNAME, BROWSERSTACK_ACCESS_KEY ), desired_capabilities=caps) diff --git a/py.test/google-search-browserstack.py b/py.test/google-search-browserstack.py index e51a4a4..2e18a64 100644 --- a/py.test/google-search-browserstack.py +++ b/py.test/google-search-browserstack.py @@ -14,7 +14,7 @@ def test_run(): - url = "http://%s:%s@hub.browserstack.com/wd/hub" % ( + url = "https://%s:%s@hub.browserstack.com/wd/hub" % ( USERNAME, BROWSERSTACK_ACCESS_KEY ) capabilities = { diff --git a/unittest/google-search-browserstack.py b/unittest/google-search-browserstack.py index bf6fc07..8f3ec80 100644 --- a/unittest/google-search-browserstack.py +++ b/unittest/google-search-browserstack.py @@ -16,7 +16,7 @@ class PythonOrgSearch(unittest.TestCase): def setUp(self): - url = "http://%s:%s@hub.browserstack.com/wd/hub" %( + url = "https://%s:%s@hub.browserstack.com/wd/hub" %( USERNAME, BROWSERSTACK_ACCESS_KEY ) capabilities = { From 01a0049765125c09661597e519a659fd95aa3e57 Mon Sep 17 00:00:00 2001 From: francisf Date: Mon, 1 Jul 2019 14:23:34 +0530 Subject: [PATCH 3/3] spelling typo - please --- google-search-browserstack.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google-search-browserstack.py b/google-search-browserstack.py index 6801532..a4c26fc 100644 --- a/google-search-browserstack.py +++ b/google-search-browserstack.py @@ -10,7 +10,7 @@ BROWSERSTACK_ACCESS_KEY = os.environ.get( 'BROWSERSTACK_ACCESS_KEY') or sys.argv[2] except IndexError: - print("Pleaes provide the username and browserstack access key as command line arguments.") + print("Please provide the username and browserstack access key as command line arguments.") sys.exit(1) capabilities = {