[py] update logging to match other bindings (#11990)

titusfortner · web-flow · commit 59fa77c675f8 · 2023-05-04T07:38:46.000+02:00
* [py] update logging to match other bindings * [py] Deleting a test we do not need anymore * [py] Deleting a test we do not need anymore --------- Co-authored-by: Diego Molina <diemol@gmail.com> Co-authored-by: Diego Molina <diemol@users.noreply.github.com> Fixes #11928
diff --git a/py/selenium/webdriver/common/selenium_manager.py b/py/selenium/webdriver/common/selenium_manager.py
@@ -70,22 +70,9 @@ def driver_location(self, options: BaseOptions) -> str:
         :Returns: The driver path to use
         """
 
-        browser = options.capabilities["browserName"]
-
-        allowed_browsers = {
-            "chrome": "chrome",
-            "firefox": "firefox",
-            "edge": "edge",
-            "MicrosoftEdge": "edge",
-            "ie": "iexplorer",
-        }
+        logger.info("Applicable driver not found; attempting to install with Selenium Manager (Beta)")
 
-        if browser not in allowed_browsers.keys():
-            raise SeleniumManagerException(
-                f"{browser} is not a valid browser.  Choose one of: {list(allowed_browsers.keys())}"
-            )
-
-        browser = allowed_browsers[browser]
+        browser = options.capabilities["browserName"]
 
         args = [str(self.get_binary()), "--browser", browser, "--output", "json"]
 
@@ -98,6 +85,9 @@ def driver_location(self, options: BaseOptions) -> str:
             args.append("--browser-path")
             args.append(str(binary_location))
 
+        if logger.getEffectiveLevel() == logging.DEBUG:
+            args.append("--debug")
+
         result = self.run(args)
         executable = result.split("\t")[-1].strip()
         logger.debug(f"Using driver at: {executable}")
@@ -112,7 +102,7 @@ def run(args: List[str]) -> str:
         :Returns: The log string containing the driver location.
         """
         command = " ".join(args)
-        logger.info(f"Executing: {command}")
+        logger.debug(f"Executing process: {command}")
         completed_proc = subprocess.run(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         stdout = completed_proc.stdout.decode("utf-8").rstrip("\n")
         stderr = completed_proc.stderr.decode("utf-8").rstrip("\n")
@@ -125,4 +115,6 @@ def run(args: List[str]) -> str:
             for item in output["logs"]:
                 if item["level"] == "WARN":
                     logger.warning(item["message"])
+                if item["level"] == "DEBUG":
+                    logger.debug(item["message"])
             return result
diff --git a/py/test/selenium/webdriver/common/selenium_manager_tests.py b/py/test/selenium/webdriver/common/selenium_manager_tests.py
@@ -24,14 +24,6 @@
 from selenium.webdriver.common.selenium_manager import SeleniumManager
 
 
-def test_non_supported_browser_raises_sme():
-    msg = r"foo is not a valid browser.  Choose one of: \['chrome', 'firefox', 'edge', 'MicrosoftEdge', 'ie'\]"
-    with pytest.raises(SeleniumManagerException, match=msg):
-        options = Options()
-        options.capabilities["browserName"] = "foo"
-        _ = SeleniumManager().driver_location(options)
-
-
 def test_browser_version_is_used_for_sm(mocker):
     import subprocess
 
