use a custom fedcm_webserver fixture to use the ExtendedHandler

Author: navin772

py/conftest.py

@@ -21,6 +21,7 @@
 import subprocess
 import time
 from test.selenium.webdriver.common.network import get_lan_ip
+from test.selenium.webdriver.common.webserver import ExtendedHandler
 from test.selenium.webdriver.common.webserver import SimpleWebServer
 from urllib.request import urlopen
 
@@ -329,6 +330,16 @@ def webserver(request):
     webserver.stop()
 
 
+@pytest.fixture(scope="session")
+def fedcm_webserver(request):
+    """Webserver fixture specifically for FedCM tests using ExtendedHandler."""
+    host = get_lan_ip() if request.config.getoption("use_lan_ip") else None
+    webserver = SimpleWebServer(host=host, handler_class=ExtendedHandler)
+    webserver.start()
+    yield webserver
+    webserver.stop()
+
+
 @pytest.fixture
 def edge_service():
     from selenium.webdriver.edge.service import Service as EdgeService

py/test/selenium/webdriver/chrome/fedcm_tests.py

@@ -22,8 +22,8 @@
 
 class TestFedCM:
     @pytest.fixture(autouse=True)
-    def setup(self, driver, webserver):
-        driver.get(webserver.where_is("fedcm/fedcm.html", localhost=True))
+    def setup(self, driver, fedcm_webserver):
+        driver.get(fedcm_webserver.where_is("fedcm/fedcm.html", localhost=True))
         self.dialog = driver.fedcm_dialog
 
     def test_no_dialog_present(self, driver):
@@ -40,7 +40,7 @@ def test_no_dialog_present(self, driver):
         with pytest.raises(NoAlertPresentException):
             self.dialog.cancel()
 
-    def test_dialog_present(self, driver, webserver):
+    def test_dialog_present(self, driver):
 
         driver.execute_script("triggerFedCm();")
         dialog = driver.wait_for_fedcm_dialog()