[py] Remove CDP support for Firefox

Author: pujagani

py/selenium/webdriver/remote/webdriver.py

@@ -1201,10 +1201,8 @@ def start_devtools(self):
 
                 devtools = cdp.import_devtools(version)
                 if self.caps["browserName"].lower() == "firefox":
-                    warnings.warn(
-                        "CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi.",
-                        DeprecationWarning,
-                        stacklevel=2,
+                    raise RuntimeError(
+                        "CDP support for Firefox has been removed. Please switch to WebDriver BiDi."
                     )
             self._websocket_connection = WebSocketConnection(ws_url)
             targets = self._websocket_connection.execute(devtools.target.get_targets())
@@ -1262,9 +1260,7 @@ def _get_cdp_details(self):
             debugger_address = self.caps.get("goog:chromeOptions").get("debuggerAddress")
         elif self.caps.get("browserName") == "MicrosoftEdge":
             debugger_address = self.caps.get("ms:edgeOptions").get("debuggerAddress")
-        else:
-            _firefox = True
-            debugger_address = self.caps.get("moz:debuggerAddress")
+
         res = http.request("GET", f"http://{debugger_address}/json/version")
         data = json.loads(res.data)
 
@@ -1273,12 +1269,7 @@ def _get_cdp_details(self):
 
         import re
 
-        if _firefox:
-            # Mozilla Automation Team asked to only support 85
-            # until WebDriver Bidi is available.
-            version = 85
-        else:
-            version = re.search(r".*/(\d+)\.", browser_version).group(1)
+        version = re.search(r".*/(\d+)\.", browser_version).group(1)
 
         return version, websocket_url
 

py/test/selenium/webdriver/common/devtools_tests.py

@@ -20,18 +20,13 @@
 
 
 @pytest.mark.xfail_safari
+@pytest.mark.xfail_firefox
 def test_check_console_messages(driver, pages):
     with pytest.warns(None) as record:
         devtools, connection = driver.start_devtools()
     console_api_calls = []
 
-    if driver.caps["browserName"].lower() == "firefox":
-        assert (
-            record[0].message.args[0]
-            == "CDP support for Firefox is deprecated and will be removed in future versions. Please switch to WebDriver BiDi."
-        )
-    else:
-        assert len(record) == 0
+    assert len(record) == 0
 
     connection.execute(devtools.runtime.enable())
     connection.on(devtools.runtime.ConsoleAPICalled, console_api_calls.append)