extract

Author: KazuCocoa

appium/webdriver/webdriver.py

@@ -175,6 +175,20 @@ def add_command(self) -> Tuple[str, str]:
         raise NotImplementedError()
 
 
+def _get_client_config_and_connection(
+    command_executor: Union[str, AppiumConnection], client_config: Optional[AppiumClientConfig]
+) -> tuple[AppiumConnection, Optional[AppiumClientConfig]]:
+    if not isinstance(command_executor):
+        return (command_executor, client_config)
+
+    # command_executor is str
+    if client_config is None:
+        # Do not keep None to avoid warnings in Selenium
+        # which can prevent with ClientConfig instance usage.
+        client_config = AppiumClientConfig(remote_server_addr=command_executor)
+    return (AppiumConnection(client_config=client_config), client_config)
+
+
 class WebDriver(
     webdriver.Remote,
     ActionHelpers,
@@ -211,13 +225,9 @@ def __init__(
         options: Union[AppiumOptions, List[AppiumOptions], None] = None,
         client_config: Optional[AppiumClientConfig] = None,
     ):
-        if isinstance(command_executor, str):
-            # Do not keep None to avoid warnings in Selenium which can prevent with ClientConfig instance usage.
-            if client_config is None:
-                client_config = AppiumClientConfig(remote_server_addr=command_executor)
-            # To prevent generating RemoteConnection in selenium
-            command_executor = AppiumConnection(client_config=client_config)
-
+        command_executor, client_config = _get_client_config_and_connection(
+            command_executor=command_executor, client_config=client_config
+        )
         super().__init__(
             command_executor=command_executor,
             file_detector=file_detector,

test/unit/webdriver/webdriver_test.py

@@ -22,7 +22,7 @@
 from appium.options.android import UiAutomator2Options
 from appium.webdriver.appium_connection import AppiumConnection
 from appium.webdriver.client_config import AppiumClientConfig
-from appium.webdriver.webdriver import ExtensionBase, WebDriver
+from appium.webdriver.webdriver import ExtensionBase, WebDriver, _get_client_config_and_connection
 from test.helpers.constants import SERVER_URL_BASE
 from test.unit.helper.test_helper import (
     android_w3c_driver,
@@ -420,6 +420,16 @@ def test_extention_command_check(self):
             'script': 'mobile: startActivity',
         } == get_httpretty_request_body(httpretty.last_request())
 
+    def test_get_client_config_and_connection(self):
+        command_executor, client_config = _get_client_config_and_connection(
+            command_executor='http://127.0.0.1:4723', client_config=None
+        )
+
+        assert isinstance(command_executor, AppiumConnection)
+        assert command_executor._url == 'http://127.0.0.1:4723'
+        assert isinstance(client_config, AppiumClientConfig)
+        assert client_config.remote_server_addr == 'http://127.0.0.1:4723'
+
 
 class SubWebDriver(WebDriver):
     def __init__(self, command_executor, options=None):