Better logging when error in closing browser

aaltat · aaltat · commit 5eacfc8aead0 · 2019-05-05T19:25:46.000+01:00
diff --git a/atest/acceptance/open_and_close.robot b/atest/acceptance/open_and_close.robot
@@ -1,6 +1,7 @@
 *** Settings ***
 Suite Teardown    Close All Browsers
 Resource          resource.robot
+Library           ../resources/testlibs/cache_error.py
 
 *** Test Cases ***
 Browser Should Open And Close
@@ -77,3 +78,13 @@ Open Browser desired_capabilities As Dictionary
     ${caps}    Create Dictionary    foo=${True}
     Open Browser    ${ROOT}/forms/prefilled_email_form.html    ${BROWSER}
      ...    remote_url=${REMOTE_URL}    desired_capabilities=${caps}
+
+When Closing Browsers Causes An Error
+    [Documentation]
+    ...    FAIL       AttributeError: 'NoneType' object has no attribute 'quit'
+    ...    LOG 3:8    ERROR When closing browser, received exception: 'NoneType' object has no attribute 'quit'
+    ...    LOG 3:9    ERROR When closing browser, received exception: 'NoneType' object has no attribute 'quit'
+    Open Browser    ${ROOT}/forms/prefilled_email_form.html    ${BROWSER}    Browser 1
+    ...    remote_url=${REMOTE_URL}    desired_capabilities=${DESIRED_CAPABILITIES}
+    Invalidate Driver
+    Close All Browsers
diff --git a/atest/resources/testlibs/cache_error.py b/atest/resources/testlibs/cache_error.py
@@ -0,0 +1,7 @@
+from robot.libraries.BuiltIn import BuiltIn
+
+
+def invalidate_driver():
+    sl = BuiltIn().get_library_instance('SeleniumLibrary')
+    sl.register_driver(None, 'tidii')
+    sl.register_driver(None, 'foobar')
diff --git a/src/SeleniumLibrary/keywords/webdrivertools.py b/src/SeleniumLibrary/keywords/webdrivertools.py
@@ -17,9 +17,9 @@
 import os
 import warnings
 
+from robot.api import logger
 from robot.utils import ConnectionCache
 from selenium import webdriver
-from selenium.common.exceptions import WebDriverException
 
 from SeleniumLibrary.utils import is_falsy, is_truthy, is_noney
 
@@ -240,7 +240,8 @@ def close_all(self):
     def _quit(self, driver, error):
         try:
             driver.quit()
-        except WebDriverException as exception:
+        except Exception as exception:
+            logger.error('When closing browser, received exception: %s' % exception)
             error = exception
         return error
 
diff --git a/utest/test/keywords/test_webdrivercache.py b/utest/test/keywords/test_webdrivercache.py
@@ -198,6 +198,19 @@ def test_close_all_cache_all_quite_fails(self):
             cache.close_all()
         self.verify_cache(cache)
 
+    def test_close_all_cache_not_selenium_error(self):
+        cache = WebDriverCache()
+        driver0, driver1, driver2 = mock(), mock(), mock()
+        when(driver0).quit().thenRaise(RemoteDriverServerException('stuff.'))
+        when(driver1).quit().thenRaise(ValueError('stuff.'))
+        when(driver2).quit().thenRaise(TimeoutException('timeout.'))
+        cache.register(driver0, 'bar0')
+        cache.register(driver1, 'bar1')
+        cache.register(driver2, 'bar2')
+        with self.assertRaises(TimeoutException):
+            cache.close_all()
+        self.verify_cache(cache)
+
     def test_close_all_no_error(self):
         cache = WebDriverCache()
         driver0, driver1, driver2 = mock(), mock(), mock()
