Turn proxy string warnings into errors (configurable)

Author: mdmintz

seleniumbase/config/settings.py

@@ -69,6 +69,11 @@
 # Messenger notifications appear when reaching assert statements in Demo Mode.
 DEFAULT_MESSAGE_DURATION = 2.55
 
+# If True, an Exception is raised immediately for invalid proxy string syntax.
+# If False, a Warning will appear after the test, with no proxy server used.
+# (This applies when using --proxy=[PROXY_STRING] for using a proxy server.)
+RAISE_INVALID_PROXY_STRING_EXCEPTION = True
+
 # #####>>>>>----- MasterQA SETTINGS -----<<<<<#####
 # ##### (Used when importing MasterQA as the parent class)
 

seleniumbase/core/browser_launcher.py

@@ -9,6 +9,7 @@
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
 from seleniumbase.config import proxy_list
+from seleniumbase.config import settings
 from seleniumbase.core import download_helper
 from seleniumbase.core import proxy_helper
 from seleniumbase.core import capabilities_parser
@@ -150,12 +151,16 @@ def _create_firefox_profile(downloads_path, proxy_string):
 def display_proxy_warning(proxy_string):
     message = ('\n\nWARNING: Proxy String ["%s"] is NOT in the expected '
                '"ip_address:port" or "server:port" format, '
-               '(OR the key does not exist in proxy_list.PROXY_LIST). '
-               '*** DEFAULTING to NOT USING a Proxy Server! ***'
+               '(OR the key does not exist in '
+               'seleniumbase.config.proxy_list.PROXY_LIST).'
                % proxy_string)
-    warnings.simplefilter('always', Warning)  # See Warnings
-    warnings.warn(message, category=Warning, stacklevel=2)
-    warnings.simplefilter('default', Warning)  # Set Default
+    if settings.RAISE_INVALID_PROXY_STRING_EXCEPTION:
+        raise Exception(message)
+    else:
+        message += ' *** DEFAULTING to NOT USING a Proxy Server! ***'
+        warnings.simplefilter('always', Warning)  # See Warnings
+        warnings.warn(message, category=Warning, stacklevel=2)
+        warnings.simplefilter('default', Warning)  # Set Default
 
 
 def validate_proxy_string(proxy_string):