Appium-Python-Client 6.1.0__py3-none-any.whl → 6.1.1__py3-none-any.whl

appium/webdriver/appium_service.py

@@ -27,6 +27,7 @@ from selenium.webdriver.remote.remote_connection import urllib3
 DEFAULT_HOST = '127.0.0.1'
 DEFAULT_PORT = 4723
 STARTUP_TIMEOUT_MS = 60000
+STOP_TIMEOUT_SEC = 5.5
 STATE_CHECK_INTERVAL_MS = 500
 MAIN_SCRIPT_PATH = 'appium/build/lib/main.js'
 STATUS_URL = '/status'
@@ -124,15 +125,26 @@ class AppiumService:
             error_msg = startup_failure_msg
         if error_msg is not None:
             if stderr == sp.PIPE and self._process.stderr is not None:
-                # noinspection PyUnresolvedReferences
-                err_output = self._process.stderr.read()
+                # The server might still be running, for example if it does not listen on the expected URL.
+                # Reading its stderr before the process exits would block forever, so terminate it first.
+                self._process.terminate()
+                try:
+                    _, err_output = self._process.communicate(timeout=STOP_TIMEOUT_SEC)
+                except sp.TimeoutExpired:
+                    # The server ignored the termination request. Kill it, so its error output is not lost.
+                    self._process.kill()
+                    try:
+                        _, err_output = self._process.communicate(timeout=STOP_TIMEOUT_SEC)
+                    except sp.TimeoutExpired as e:
+                        # Another process might still hold stderr open. Keep the output read so far.
+                        err_output = e.stderr or b''
                 if err_output:
                     error_msg += f'\nOriginal error: {str(err_output)}'
             self.stop()
             raise AppiumServiceError(error_msg)
         return self._process
 
-    def stop(self, timeout: float = 5.5) -> bool:
+    def stop(self, timeout: float = STOP_TIMEOUT_SEC) -> bool:
         """Stops Appium service if it is running.
 
         The call will be ignored if the service is not running

{appium_python_client-6.1.0.dist-info → appium_python_client-6.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: Appium-Python-Client
-Version: 6.1.0
+Version: 6.1.1
 Summary: Python client for Appium
 Project-URL: Homepage, https://appium.io/
 Project-URL: Repository, https://github.com/appium/python-client

{appium_python_client-6.1.0.dist-info → appium_python_client-6.1.1.dist-info}/RECORD

@@ -272,7 +272,7 @@ appium/protocols/webdriver/can_execute_scripts.py,sha256=dMRDjreiyV3IJp7-NRUx1Tj
 appium/protocols/webdriver/can_find_elements.py,sha256=glM-Qpe-_KyLhZmojl6aa82B3xhEzRpJPyVQHhtOP8Q,1492
 appium/webdriver/__init__.py,sha256=oT-lIYWpqD562rbXy36HlS03pKfW48BIxqZsqt1XEm0,730
 appium/webdriver/appium_connection.py,sha256=qh6LowDI9_6gwPxy50LGD96YTqKwa0ODGM1RUGOSpks,2580
-appium/webdriver/appium_service.py,sha256=lMfbkiHQIccpqy0_kG7qtO1BbTljIJq8aYTcOQ0ErPY,12172
+appium/webdriver/appium_service.py,sha256=cBxkn8EqwtX2NwbcNmae83KwYxdhdZIAWo2zhFxbcYk,12975
 appium/webdriver/applicationstate.py,sha256=zUPaMt4o4mdAtWP6FapYLJju_tqO6FmMcYFpbFz83dM,735
 appium/webdriver/client_config.py,sha256=iuVcGsBF9eGNsF_gzs8b6vZWS0iI1u7actaBGBwNrqY,1631
 appium/webdriver/clipboard_content_type.py,sha256=Tyks8xA2dqvuQGEV4iVYr-iMvB-hsQBEcu8wWBxtJ4M,661
@@ -319,7 +319,7 @@ appium/webdriver/extensions/flutter_integration/__init__.py,sha256=wSUl6yC2TJNla
 appium/webdriver/extensions/flutter_integration/flutter_commands.py,sha256=FwNqIykRyMAU8-344GTlceBOxLbS-bA9bfGX4iJpHxw,11985
 appium/webdriver/extensions/flutter_integration/flutter_finder.py,sha256=HH9vGAouJuHzp29Jam_lQGrh67PDq6MxU5Ifewf7C5w,2164
 appium/webdriver/extensions/flutter_integration/scroll_directions.py,sha256=CkOv7k21SMe-h2-EYSZ6MBKBGTRC1csQ-tuowHgMn0E,85
-appium_python_client-6.1.0.dist-info/METADATA,sha256=lnYvisOqH_pImigF_8hYtOb-kSMOLzqzSnpE2k7oLS4,21766
-appium_python_client-6.1.0.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
-appium_python_client-6.1.0.dist-info/licenses/LICENSE,sha256=QxeKfXNmPWCfFyrXiwdVzMFPFMK0nlBrKhYLUoIcqhk,11384
-appium_python_client-6.1.0.dist-info/RECORD,,
+appium_python_client-6.1.1.dist-info/METADATA,sha256=zlYARy-DslHhO-EEqR1BlcpyiVlnKPQ43PSL_d6UVUo,21766
+appium_python_client-6.1.1.dist-info/WHEEL,sha256=2iZrJkDIkeDh0k9SikKMqFuRP-ua6mb4Ir1AsER4BEw,87
+appium_python_client-6.1.1.dist-info/licenses/LICENSE,sha256=QxeKfXNmPWCfFyrXiwdVzMFPFMK0nlBrKhYLUoIcqhk,11384
+appium_python_client-6.1.1.dist-info/RECORD,,