use webserver

Author: navin772

py/conftest.py

@@ -21,7 +21,6 @@
 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
 
@@ -330,16 +329,6 @@ def webserver(request):
     webserver.stop()
 
 
-@pytest.fixture(autouse=True, scope="session")
-def extended_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, extended_webserver):
-        driver.get(extended_webserver.where_is("fedcm/fedcm.html", localhost=True))
+    def setup(self, driver, webserver):
+        driver.get(webserver.where_is("fedcm/fedcm.html", localhost=True))
         self.dialog = driver.fedcm_dialog
 
     def test_no_dialog_present(self, driver):