Remove pytest-timeout (not thread-safe) and prevent use

Author: mdmintz

requirements.txt

@@ -22,7 +22,6 @@ pytest-html==2.0.1;python_version>="3.6"
 pytest-metadata>=1.8.0
 pytest-ordering>=0.6
 pytest-rerunfailures>=8.0
-pytest-timeout>=1.3.4
 pytest-xdist>=1.31.0
 parameterized>=0.7.1
 soupsieve==1.9.5

seleniumbase/plugins/base_plugin.py

@@ -77,15 +77,28 @@ def options(self, parser, env):
             default=False,
             help="If true when using report, will display it after tests run.")
         found_processes_arg = False
+        found_timeout_arg = False
         for arg in sys.argv:
             if "--processes=" in arg:
                 found_processes_arg = True
+            if "--timeout=" in arg:
+                found_timeout_arg = True
         if found_processes_arg:
             print("* WARNING: Don't use multi-threading with nosetests! *")
             parser.add_option(
-                '--processes', dest='processes',
+                '--processes',
+                dest='processes',
                 default=0,
                 help="WARNING: Don't use multi-threading with nosetests!")
+        if found_timeout_arg:
+            print("\n  WARNING: Don't use --timeout=s from pytest-timeout!")
+            print("  It's not thread-safe for WebDriver processes!")
+            print("  Use --time-limit=s from SeleniumBase instead!\n")
+            parser.add_option(
+                '--timeout',
+                dest='timeout',
+                default=0,
+                help="Don't use --timeout=s! Use --time-limit=s instead!")
 
     def configure(self, options, conf):
         super(Base, self).configure(options, conf)

seleniumbase/plugins/pytest_plugin.py

@@ -349,6 +349,12 @@ def pytest_addoption(parser):
                      help="""Setting this overrides the default timeout
                           by the multiplier when waiting for page elements.
                           Unused when tests overide the default value.""")
+    for arg in sys.argv:
+        if "--timeout=" in arg:
+            raise Exception(
+                "\n\n  Don't use --timeout=s from pytest-timeout! "
+                "\n  It's not thread-safe for WebDriver processes! "
+                "\n  Use --time-limit=s from SeleniumBase instead!\n")
 
 
 def pytest_configure(config):

setup.py

@@ -104,7 +104,6 @@
         'pytest-metadata>=1.8.0',
         'pytest-ordering>=0.6',
         'pytest-rerunfailures>=8.0',
-        'pytest-timeout>=1.3.4',
         'pytest-xdist>=1.31.0',
         'parameterized>=0.7.1',
         'soupsieve==1.9.5',