Merge pull request #142 from seleniumbase/better-error-handling

Better error handling

Author: mdmintz

pytest.ini

@@ -1,2 +1,2 @@
 [pytest]
-addopts = --capture=no --with-selenium --ignore conftest.py
+addopts = --capture=no --ignore conftest.py

seleniumbase/fixtures/base_case.py

@@ -45,7 +45,6 @@ class MyTestClass(BaseCase):
 from seleniumbase.fixtures import page_utils
 from seleniumbase.fixtures import xpath_to_css
 from selenium.common.exceptions import (StaleElementReferenceException,
-                                        TimeoutException,
                                         WebDriverException)
 from selenium.common import exceptions as selenium_exceptions
 try:
@@ -1153,8 +1152,8 @@ def wait_for_angularjs(self, timeout=settings.LARGE_TIMEOUT, **kwargs):
                                'suffix': suffix}
         try:
             self.execute_async_script(script, timeout=timeout)
-        except TimeoutException:
-            pass
+        except Exception:
+            time.sleep(0.05)
 
     def wait_for_and_accept_alert(self, timeout=settings.LARGE_TIMEOUT):
         if self.timeout_multiplier and timeout == settings.LARGE_TIMEOUT:
@@ -1464,6 +1463,10 @@ def setUp(self):
                 self.headless_active = True
 
         # Launch WebDriver for both Pytest and Nosetests
+        if not hasattr(self, "browser"):
+            raise Exception("""SeleniumBase plugins did not load! """
+                            """Please reinstall using:\n"""
+                            """ >>> "python setup.py develop" <<< """)
         self.driver = browser_launcher.get_driver(self.browser,
                                                   self.headless,
                                                   self.use_grid,

server_setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.5.5',
+    version='1.5.6',
     description='Web Automation & Testing Framework - http://seleniumbase.com',
     long_description='Web Automation and Testing Framework - seleniumbase.com',
     platforms='Mac * Windows * Linux * Docker',

setup.cfg

@@ -3,7 +3,6 @@
 # nocapture=1 displays print statements from output. Undo this by using: --nologcapture
 # logging-level=INFO keeps the logs much cleaner than using DEBUG
 nocapture=1
-with-selenium=1
 logging-level=INFO
 
 [bdist_wheel]

setup.py

@@ -8,7 +8,7 @@
 
 setup(
     name='seleniumbase',
-    version='1.5.5',
+    version='1.5.6',
     description='Web Automation & Testing Framework - http://seleniumbase.com',
     long_description='Web Automation and Testing Framework - seleniumbase.com',
     platforms='Mac * Windows * Linux * Docker',