Fix issues with setting the time-limit in tests

Author: mdmintz

seleniumbase/fixtures/base_case.py

@@ -1833,6 +1833,10 @@ def wait_for_angularjs(self, timeout=None, **kwargs):
     def sleep(self, seconds):
         if not sb_config.time_limit:
             time.sleep(seconds)
+        elif seconds <= 0.3:
+            shared_utils.check_if_time_limit_exceeded()
+            time.sleep(seconds)
+            shared_utils.check_if_time_limit_exceeded()
         else:
             start_ms = time.time() * 1000.0
             stop_ms = start_ms + (seconds * 1000.0)
@@ -4728,7 +4732,8 @@ def setUp(self, masterqa_mode=False):
             self.demo_mode = sb_config.demo_mode
             self.demo_sleep = sb_config.demo_sleep
             self.highlights = sb_config.highlights
-            self.time_limit = sb_config.time_limit
+            self.time_limit = sb_config._time_limit
+            sb_config.time_limit = sb_config._time_limit  # Reset between tests
             self.environment = sb_config.environment
             self.env = self.environment  # Add a shortened version
             self.with_selenium = sb_config.with_selenium  # Should be True

seleniumbase/fixtures/shared_utils.py

@@ -5,6 +5,11 @@
 from seleniumbase import config as sb_config
 
 
+def __time_limit_exceeded(message):
+    raise Exception(
+        "TimeLimitExceeded: %s" % message)
+
+
 def check_if_time_limit_exceeded():
     if sb_config.time_limit:
         time_limit = sb_config.time_limit
@@ -16,6 +21,7 @@ def check_if_time_limit_exceeded():
                 display_time_limit = int(time_limit)
                 if display_time_limit == 1:
                     plural = ""
-            raise Exception(
+            message = (
                 "This test has exceeded the time limit of %s second%s!"
                 "" % (display_time_limit, plural))
+            __time_limit_exceeded(message)

seleniumbase/plugins/pytest_plugin.py

@@ -468,6 +468,7 @@ def pytest_configure(config):
     sb_config.database_env = config.getoption('database_env')
     sb_config.log_path = 'latest_logs/'  # (No longer editable!)
     sb_config.archive_logs = config.getoption('archive_logs')
+    sb_config._time_limit = config.getoption('time_limit')
     sb_config.time_limit = config.getoption('time_limit')
     sb_config.slow_mode = config.getoption('slow_mode')
     sb_config.demo_mode = config.getoption('demo_mode')