Improve handling of exceptions

Author: mdmintz

seleniumbase/common/decorators.py

@@ -4,6 +4,7 @@
 import warnings
 from contextlib import contextmanager
 from functools import wraps
+from seleniumbase.common.exceptions import TimeoutException
 
 
 @contextmanager
@@ -62,7 +63,7 @@ def my_method():
             )
             if exception:
                 message = exception.msg + "\nAND " + message
-            raise Exception(message)
+            raise TimeoutException(message)
 
 
 @contextmanager
@@ -108,7 +109,7 @@ def my_method():
             )
             if exception:
                 message = exception.msg + "\nAND " + message
-            raise Exception(message)
+            raise TimeoutException(message)
 
 
 def retry_on_exception(tries=6, delay=1, backoff=2, max_delay=32):

seleniumbase/common/exceptions.py

@@ -6,6 +6,7 @@
     OutOfScopeException => Used by BaseCase methods when setUp() is skipped.
     TextNotVisibleException => Called when expected text fails to appear.
     TimeLimitExceededException => Called when exceeding "--time-limit=SECONDS".
+    TimeoutException => Called when some timeout limit has been exceeded.
     VisualException => Called when there's a Visual Diff Assertion Failure.
 """
 
@@ -38,5 +39,64 @@ class TimeLimitExceededException(Exception):
     pass
 
 
+class TimeoutException(Exception):
+    pass
+
+
 class VisualException(Exception):
     pass
+
+
+""" Selenium Exceptions (Simplified for SeleniumBase) """
+
+
+class WebDriverException(Exception):
+    """Base webdriver exception."""
+
+    def __init__(self, msg=None, screen=None, stacktrace=None):
+        super().__init__()
+        self.msg = msg
+        self.screen = screen
+        self.stacktrace = stacktrace
+
+    def __str__(self):
+        exception_msg = "Message: %s\n" % self.msg
+        if self.screen:
+            exception_msg += "Screenshot: available via screen\n"
+        if self.stacktrace:
+            stacktrace = "\n".join(self.stacktrace)
+            exception_msg += "Stacktrace:\n%s" % stacktrace
+        return exception_msg
+
+
+class InvalidSwitchToTargetException(WebDriverException):
+    """Thrown when frame or window target to be switched doesn't exist."""
+
+
+class NoSuchFrameException(InvalidSwitchToTargetException):
+    """Thrown when frame target to be switched doesn't exist."""
+
+
+class NoSuchWindowException(InvalidSwitchToTargetException):
+    """Thrown when window target to be switched doesn't exist."""
+
+
+class NoSuchElementException(WebDriverException):
+    """Thrown when element could not be found."""
+
+
+class NoSuchAttributeException(WebDriverException):
+    """Thrown when the attribute of element could not be found."""
+
+
+class InvalidElementStateException(WebDriverException):
+    """Thrown when a command could not be completed because the element is in
+    an invalid state."""
+
+
+class NoAlertPresentException(WebDriverException):
+    """Thrown when switching to no presented alert."""
+
+
+class ElementNotVisibleException(InvalidElementStateException):
+    """Thrown when an element is present in the DOM, but not visible."""

seleniumbase/fixtures/shared_utils.py

@@ -124,42 +124,43 @@ def format_exc(exception, message):
     from selenium.common.exceptions import NoSuchWindowException
     from seleniumbase.common.exceptions import NoSuchFileException
     from seleniumbase.common.exceptions import TextNotVisibleException
+    from seleniumbase.common import exceptions
 
     if exception == Exception:
         exc = Exception
         return exc, message
     elif exception == ElementNotVisibleException:
-        exc = ElementNotVisibleException
+        exc = exceptions.ElementNotVisibleException
     elif exception == "ElementNotVisibleException":
-        exc = ElementNotVisibleException
+        exc = exceptions.ElementNotVisibleException
     elif exception == NoSuchElementException:
-        exc = NoSuchElementException
+        exc = exceptions.NoSuchElementException
     elif exception == "NoSuchElementException":
-        exc = NoSuchElementException
+        exc = exceptions.NoSuchElementException
     elif exception == TextNotVisibleException:
-        exc = TextNotVisibleException
+        exc = exceptions.TextNotVisibleException
     elif exception == "TextNotVisibleException":
-        exc = TextNotVisibleException
+        exc = exceptions.TextNotVisibleException
     elif exception == NoAlertPresentException:
-        exc = NoAlertPresentException
+        exc = exceptions.NoAlertPresentException
     elif exception == "NoAlertPresentException":
-        exc = NoAlertPresentException
+        exc = exceptions.NoAlertPresentException
     elif exception == NoSuchAttributeException:
-        exc = NoSuchAttributeException
+        exc = exceptions.NoSuchAttributeException
     elif exception == "NoSuchAttributeException":
-        exc = NoSuchAttributeException
+        exc = exceptions.NoSuchAttributeException
     elif exception == NoSuchFrameException:
-        exc = NoSuchFrameException
+        exc = exceptions.NoSuchFrameException
     elif exception == "NoSuchFrameException":
-        exc = NoSuchFrameException
+        exc = exceptions.NoSuchFrameException
     elif exception == NoSuchWindowException:
-        exc = NoSuchWindowException
+        exc = exceptions.NoSuchWindowException
     elif exception == "NoSuchWindowException":
-        exc = NoSuchWindowException
+        exc = exceptions.NoSuchWindowException
     elif exception == NoSuchFileException:
-        exc = NoSuchFileException
+        exc = exceptions.NoSuchFileException
     elif exception == "NoSuchFileException":
-        exc = NoSuchFileException
+        exc = exceptions.NoSuchFileException
     elif type(exception) is str:
         exc = Exception
         message = "%s: %s" % (exception, message)