appium · mykola-mokhnach · Jun 21, 2022 · Jun 21, 2022 · Jun 21, 2022 · Jun 21, 2022
diff --git a/...um/options/mac/mac2/system_host_option.py → appium/options/common/system_host_option.py b/...um/options/mac/mac2/system_host_option.py → appium/options/common/system_host_option.py
@@ -34,9 +34,5 @@ def system_host(self) -> Optional[str]:
     def system_host(self, value: str) -> None:
         """
         Set the name of the host for the internal server to listen on.
-        If not provided then Mac2Driver will use the default host
-        address 127.0.0.1. You could set it to 0.0.0.0 to make the
-        server listening on all available network interfaces.
-        It is also possible to set the particular interface name, for example en1.
         """
         self.set_capability(SYSTEM_HOST, value)
diff --git a/...um/options/mac/mac2/system_port_option.py → appium/options/common/system_port_option.py b/...um/options/mac/mac2/system_port_option.py → appium/options/common/system_port_option.py
@@ -34,6 +34,5 @@ def system_port(self) -> Optional[int]:
     def system_port(self, value: int) -> None:
         """
         Set the number of the port for the internal server to listen on.
-        If not provided then Mac2Driver will use the default port 10100.
         """
         self.set_capability(SYSTEM_PORT, value)
diff --git a/appium/options/mac/mac2/base.py b/appium/options/mac/mac2/base.py
@@ -21,6 +21,8 @@
 from appium.options.common.base import PLATFORM_NAME, AppiumOptions
 from appium.options.common.postrun_option import PostrunOption
 from appium.options.common.prerun_option import PrerunOption
+from appium.options.common.system_host_option import SystemHostOption
+from appium.options.common.system_port_option import SystemPortOption
 
 from .arguments_option import ArgumentsOption
 from .bootstrap_root_option import BootstrapRootOption
@@ -29,8 +31,6 @@
 from .server_startup_timeout_option import ServerStartupTimeoutOption
 from .show_server_logs_option import ShowServerLogsOption
 from .skip_app_kill_option import SkipAppKillOption
-from .system_host_option import SystemHostOption
-from .system_port_option import SystemPortOption
 from .web_driver_agent_mac_url_option import WebDriverAgentMacUrlOption
 
 
@@ -49,6 +49,47 @@ class Mac2Options(
     SystemPortOption,
     WebDriverAgentMacUrlOption,
 ):
+    @PrerunOption.prerun.setter  # type: ignore
+    def prerun(self, value: Dict[str, str]) -> None:
+        """
+        A mapping containing either 'script' or 'command' key. The value of
+        each key must be a valid AppleScript script or command to be
+        executed after before Mac2Driver session is started. See
+        https://github.com/appium/appium-mac2-driver#applescript-commands-execution
+        for more details.
+        """
+        PrerunOption.prerun.fset(self, value)  # type: ignore
+
+    @PostrunOption.postrun.setter  # type: ignore
+    def postrun(self, value: Dict[str, str]) -> None:
+        """
+        A mapping containing either 'script' or 'command' key. The value of
+        each key must be a valid AppleScript script or command to be
+        executed after Mac2Driver session is stopped. See
+        https://github.com/appium/appium-mac2-driver#applescript-commands-execution
+        for more details.
+        """
+        PostrunOption.postrun.fset(self, value)  # type: ignore
+
+    @SystemPortOption.system_port.setter  # type: ignore
+    def system_port(self, value: int) -> None:
+        """
+        Set the number of the port for the internal server to listen on.
+        If not provided then Mac2Driver will use the default port 10100.
+        """
+        SystemPortOption.system_port.fset(self, value)  # type: ignore
+
+    @SystemHostOption.system_host.setter  # type: ignore
+    def system_host(self, value: str) -> None:
+        """
+        Set the number of the port for the internal server to listen on.
+        If not provided then Mac2Driver will use the default host
+        address 127.0.0.1. You could set it to 0.0.0.0 to make the
+        server listening on all available network interfaces.
+        It is also possible to set the particular interface name, for example en1.
+        """
+        SystemHostOption.system_host.fset(self, value)  # type: ignore
+
     @property
     def default_capabilities(self) -> Dict:
         return {

diff --git a/appium/options/windows/windows/base.py b/appium/options/windows/windows/base.py
@@ -22,12 +22,12 @@
 from appium.options.common.base import PLATFORM_NAME, AppiumOptions
 from appium.options.common.postrun_option import PostrunOption
 from appium.options.common.prerun_option import PrerunOption
+from appium.options.common.system_port_option import SystemPortOption
 
 from .app_top_level_window_option import AppTopLevelWindowOption
 from .app_working_dir_option import AppWorkingDirOption
 from .create_session_timeout_option import CreateSessionTimeoutOption
 from .expreimental_web_driver_option import ExperimentalWebDriverOption
-from .system_port_option import SystemPortOption
 from .wait_for_app_launch_option import WaitForAppLaunchOption
 
 
@@ -77,6 +77,16 @@ def postrun(self, value: Dict[str, str]) -> None:
         """
         PostrunOption.postrun.fset(self, value)  # type: ignore
 
+    @SystemPortOption.system_port.setter  # type: ignore
+    def system_port(self, value: int) -> None:
+        """
+        The port number to execute Appium Windows Driver server listener on,
+        for example 5556. The port must not be occupied. The default starting port
+        number for a new Appium Windows Driver session is 4724. If this port is
+        already busy then the next free port will be automatically selected.
+        """
+        SystemPortOption.system_port.fset(self, value)  # type: ignore
+
     @property
     def default_capabilities(self) -> Dict:
         return {

diff --git a/appium/options/windows/windows/system_port_option.py b/appium/options/windows/windows/system_port_option.py
diff --git a/ci-jobs/functional/run_android_test.yml b/ci-jobs/functional/run_android_test.yml
@@ -13,10 +13,8 @@ jobs:
       - script: bash ci-jobs/functional/start-emulator.sh
         displayName: Create and run Emulator
       - script: |
-          if [[ '${{ parameters.dontRunAppium }}' != true ]]; then
-            appium --relaxed-security > appium_log.txt 2>&1 &
-            sleep 2
-          fi
+          bash ci-jobs/scripts/start_server.sh
+
           pushd "$(pwd)"
           cd test/functional/android
           python -m pytest ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}

diff --git a/ci-jobs/functional/run_ios_test.yml b/ci-jobs/functional/run_ios_test.yml
@@ -12,10 +12,8 @@ jobs:
       - script: appium driver install xcuitest
         displayName: Install XCUITest driver
       - script: |
-          if [[ '${{ parameters.dontRunAppium }}' != true ]]; then
-            appium --relaxed-security > appium_log.txt 2>&1 &
-            sleep 2
-          fi
+          bash ci-jobs/scripts/start_server.sh
+
           pushd "$(pwd)"
           cd test/functional/ios
           python -m pytest ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}

diff --git a/ci-jobs/functional/setup_appium.yml b/ci-jobs/functional/setup_appium.yml
@@ -24,4 +24,5 @@ steps:
     ffmpeg -version
     appium --version
     node --version
+    npm --version
   displayName: Check versions
diff --git a/ci-jobs/scripts/start_server.sh b/ci-jobs/scripts/start_server.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+appium server --relaxed-security > appium_log.txt 2>&1 &
+secondsStarted=$(date +%s)
+while ! nc -z 127.0.0.1 4723; do
+  sleep 0.1
+  secondsElapsed=$(( $(date +%s) - secondsStarted ))
+  if [[ $secondsElapsed -gt 30 ]]; then
+    echo "Appium server was unable to start within 30 seconds timeout"
+    exit 1
+  fi
+done