Merge pull request #41 from Telefonica/fix/selenium3

Video download works in Selenium Grid 3

CHANGELOG.rst

@@ -1,6 +1,13 @@
 Toolium Changelog
 =================
 
+v1.1.3
+------
+
+*In development*
+
+- Video download works in Selenium Grid 3
+
 v1.1.2
 ------
 

toolium/driver_wrappers_pool.py

@@ -119,6 +119,10 @@ def close_drivers_and_download_videos(cls, name, test_passed=True, maintain_defa
             if not driver_wrapper.driver:
                 continue
             try:
+                # Delete IE cookies (Workaround of IEDriverServer bug)
+                driver_type = driver_wrapper.config.get('Driver', 'type')
+                if not maintain_default and driver_type.split('-')[0] == 'iexplore':
+                    driver_wrapper.driver.delete_all_cookies()
                 # Stop driver
                 driver_wrapper.driver.quit()
                 # Download video if necessary

toolium/test/test_utils.py

@@ -103,6 +103,21 @@ def test_get_remote_node(driver_wrapper, utils):
         assert url == req_mock.request_history[0].url
 
 
+def test_get_remote_node_selenium3(driver_wrapper, utils):
+    # Configure mock
+    driver_wrapper.driver.session_id = '5af'
+    url = 'http://{}:{}/grid/api/testsession?session={}'.format('localhost', 4444, '5af')
+    grid_response_json = {'session': 'e2', 'proxyId': '10.20.30.40', 'msg': 'slot found !',
+                          'inactivityTime': 78, 'success': True, 'internalKey': '7a'}
+
+    with requests_mock.mock() as req_mock:
+        req_mock.get(url, json=grid_response_json)
+
+        # Get remote node and check result
+        assert utils.get_remote_node() == '10.20.30.40'
+        assert url == req_mock.request_history[0].url
+
+
 def test_get_remote_node_non_grid(driver_wrapper, utils):
     # Configure mock
     driver_wrapper.driver.session_id = '5af'

toolium/utils.py

@@ -207,7 +207,8 @@ def get_remote_node(self):
             url = 'http://{}:{}/grid/api/testsession?session={}'.format(host, port, session_id)
             try:
                 # Extract remote node from response
-                remote_node = urlparse(requests.get(url).json()['proxyId']).hostname
+                proxy_id = requests.get(url).json()['proxyId']
+                remote_node = urlparse(proxy_id).hostname if urlparse(proxy_id).hostname else proxy_id
                 self.logger.debug("Test running in remote node {}".format(remote_node))
             except (ValueError, KeyError):
                 # The remote node is not a grid node or the session has been closed
@@ -290,10 +291,10 @@ def is_remote_video_enabled(self, remote_node):
         if remote_node:
             url = '{}/config'.format(self._get_remote_node_url(remote_node))
             try:
-                response = requests.get(url).json()
+                response = requests.get(url, timeout=5).json()
                 record_videos = response['config_runtime']['theConfigMap']['video_recording_options'][
                     'record_test_videos']
-            except (requests.exceptions.ConnectionError, KeyError):
+            except (requests.exceptions.ConnectionError, requests.exceptions.ReadTimeout, KeyError):
                 record_videos = 'false'
             if record_videos == 'true':
                 # Wait to the video recorder start