fix: self.command_executor instance in _update_command_executor (appium#940)

KazuCocoa · web-flow · commit 17639ea682c0 · 2023-12-13T22:42:02.000-08:00
diff --git a/appium/webdriver/webdriver.py b/appium/webdriver/webdriver.py
@@ -295,8 +295,11 @@ def _update_command_executor(self, keep_alive: bool) -> None:
         executor = f'{protocol}://{hostname}:{port}{path}'
 
         logger.debug('Updated request endpoint to %s', executor)
-        # Override command executor
-        self.command_executor = RemoteConnection(executor, keep_alive=keep_alive)
+        # Override command executor.
+        if isinstance(self.command_executor, AppiumConnection):  # type: ignore
+            self.command_executor = AppiumConnection(executor, keep_alive=keep_alive)
+        else:
+            self.command_executor = RemoteConnection(executor, keep_alive=keep_alive)
         self._add_commands()
 
     # https://github.com/SeleniumHQ/selenium/blob/06fdf2966df6bca47c0ae45e8201cd30db9b9a49/py/selenium/webdriver/remote/webdriver.py#L277
diff --git a/test/unit/webdriver/webdriver_test.py b/test/unit/webdriver/webdriver_test.py
@@ -134,6 +134,7 @@ def test_create_session_register_uridirect(self):
 
         assert 'http://localhost2:4800/special/path/wd/hub' == driver.command_executor._url
         assert ['NATIVE_APP', 'CHROMIUM'] == driver.contexts
+        assert isinstance(driver.command_executor, AppiumConnection)
 
     @httpretty.activate
     def test_create_session_register_uridirect_no_direct_connect_path(self):
@@ -173,6 +174,7 @@ def test_create_session_register_uridirect_no_direct_connect_path(self):
 
         assert SERVER_URL_BASE == driver.command_executor._url
         assert ['NATIVE_APP', 'CHROMIUM'] == driver.contexts
+        assert isinstance(driver.command_executor, AppiumConnection)
 
     @httpretty.activate
     def test_get_events(self):
