Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion appium/options/android/common/adb/adb_exec_timeout_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def adb_exec_timeout(self, value: Union[timedelta, int]) -> None:
Maximum time to wait until single ADB command is executed.
20000 ms by default.
"""
self.set_capability(ADB_EXEC_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
ADB_EXEC_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def android_install_timeout(self, value: Union[timedelta, int]) -> None:
90000 ms by default
"""
self.set_capability(
ANDROID_INSTALL_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
ANDROID_INSTALL_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def app_wait_duration(self, value: Union[timedelta, int]) -> None:
Maximum amount of time to wait until the application under test is started
(e.g. an activity returns the control to the caller). 20000 ms by default.
"""
self.set_capability(APP_WAIT_DURATION, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
APP_WAIT_DURATION, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def avd_launch_timeout(self, value: Union[timedelta, int]) -> None:
Maximum timeout to wait until Android Emulator is started.
60000 ms by default.
"""
self.set_capability(AVD_LAUNCH_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
AVD_LAUNCH_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def avd_ready_timeout(self, value: Union[timedelta, int]) -> None:
Maximum timeout to wait until Android Emulator is fully booted and is ready for usage.
60000 ms by default
"""
self.set_capability(AVD_READY_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
AVD_READY_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def auto_webview_timeout(self, value: Union[timedelta, int]) -> None:
"""
Timeout to wait until a web view is available.
"""
self.set_capability(AUTO_WEBVIEW_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
AUTO_WEBVIEW_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def unlock_success_timeout(self, value: Union[timedelta, int]) -> None:
2000 ms by default.
"""
self.set_capability(
UNLOCK_SUCCESS_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
UNLOCK_SUCCESS_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def espresso_server_launch_timeout(self, value: Union[timedelta, int]) -> None:
45000 ms by default
"""
self.set_capability(
ESPRESSO_SERVER_LAUNCH_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
ESPRESSO_SERVER_LAUNCH_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ def uiautomator2_server_install_timeout(self, value: Union[timedelta, int]) -> N
20000 ms by default
"""
self.set_capability(
UIAUTOMATOR2_SERVER_INSTALL_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
UIAUTOMATOR2_SERVER_INSTALL_TIMEOUT,
int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value,
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,6 @@ def uiautomator2_server_launch_timeout(self, value: Union[timedelta, int]) -> No
the device. 30000 ms by default
"""
self.set_capability(
UIAUTOMATOR2_SERVER_LAUNCH_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
UIAUTOMATOR2_SERVER_LAUNCH_TIMEOUT,
int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value,
)
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,6 @@ def uiautomator2_server_read_timeout(self, value: Union[timedelta, int]) -> None
240000 ms by default
"""
self.set_capability(
UIAUTOMATOR2_SERVER_READ_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
UIAUTOMATOR2_SERVER_READ_TIMEOUT,
int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value,
)
2 changes: 1 addition & 1 deletion appium/options/common/new_command_timeout_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@ def new_command_timeout(self, value: Union[timedelta, int]) -> None:
Set the allowed time before seeing a new server command.
The value could either be provided as timedelta instance or an integer number of seconds.
"""
self.set_capability(NEW_COMMAND_TIMEOUT, value.seconds if isinstance(value, timedelta) else value)
self.set_capability(NEW_COMMAND_TIMEOUT, value.total_seconds() if isinstance(value, timedelta) else value)
4 changes: 3 additions & 1 deletion appium/options/ios/xcuitest/app/app_push_timeout_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,6 @@ def app_push_timeout(self, value: Union[timedelta, int]) -> None:
Works for real devices only.
The default value is 30000ms.
"""
self.set_capability(APP_PUSH_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
APP_PUSH_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
4 changes: 2 additions & 2 deletions appium/options/ios/xcuitest/other/command_timeouts_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ def command_timeouts(self, value: Union[Dict[str, timedelta], timedelta, int]) -
were not explicitly mentioned as dictionary keys
"""
if isinstance(value, dict):
self.set_capability(COMMAND_TIMEOUTS, {k: v.microseconds // 1000 for k, v in value.items()})
self.set_capability(COMMAND_TIMEOUTS, {k: int(v.total_seconds() * 1000) for k, v in value.items()})
elif isinstance(value, timedelta):
self.set_capability(COMMAND_TIMEOUTS, f'{value.microseconds // 1000}')
self.set_capability(COMMAND_TIMEOUTS, f'{int(value.total_seconds() * 1000)}')
else:
self.set_capability(COMMAND_TIMEOUTS, value)
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,5 @@ def simulator_startup_timeout(self, value: Union[timedelta, int]) -> None:
during the boot up procedure.
"""
self.set_capability(
SIMULATOR_STARTUP_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
SIMULATOR_STARTUP_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -42,4 +42,4 @@ def wait_for_idle_timeout(self, value: Union[timedelta, float]) -> None:
(not recommended) and has the same effect as setting waitForQuiescence to false.
Available since Appium 1.20.0.
"""
self.set_capability(WAIT_FOR_IDLE_TIMEOUT, value.seconds if isinstance(value, timedelta) else value)
self.set_capability(WAIT_FOR_IDLE_TIMEOUT, value.total_seconds() if isinstance(value, timedelta) else value)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def wda_connection_timeout(self, value: Union[timedelta, int]) -> None:
Defaults to 240000ms.
"""
self.set_capability(
WDA_CONNECTION_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
WDA_CONNECTION_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ def wda_eventloop_idle_delay(self, value: Union[timedelta, float]) -> None:
If you enable this capability start with at least 3 seconds and try increasing it,
if creating the session still fails. Defaults to 0.
"""
self.set_capability(WDA_EVENTLOOP_IDLE_DELAY, value.seconds if isinstance(value, timedelta) else value)
self.set_capability(WDA_EVENTLOOP_IDLE_DELAY, value.total_seconds() if isinstance(value, timedelta) else value)
4 changes: 3 additions & 1 deletion appium/options/ios/xcuitest/wda/wda_launch_timeout_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,6 @@ def wda_launch_timeout(self, value: Union[timedelta, int]) -> None:
Timeout to wait for WebDriverAgent to be pingable,
after its building is finished. Defaults to 60000ms.
"""
self.set_capability(WDA_LAUNCH_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value)
self.set_capability(
WDA_LAUNCH_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def wda_startup_retry_interval(self, value: Union[timedelta, int]) -> None:
Defaults to 10000ms.
"""
self.set_capability(
WDA_STARTUP_RETRY_INTERVAL, value.microseconds // 1000 if isinstance(value, timedelta) else value
WDA_STARTUP_RETRY_INTERVAL, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def webkit_response_timeout(self, value: Union[timedelta, int]) -> None:
WebKit in a Safari session. Defaults to 5000ms.
"""
self.set_capability(
WEBKIT_RESPONSE_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
WEBKIT_RESPONSE_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -39,5 +39,5 @@ def webview_connect_timeout(self, value: Union[timedelta, int]) -> None:
MobileSafari or hybrid apps. Defaults to 0ms.
"""
self.set_capability(
WEBVIEW_CONNECT_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
WEBVIEW_CONNECT_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
2 changes: 1 addition & 1 deletion appium/options/mac/mac2/server_startup_timeout_option.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@ def server_startup_timeout(self, value: Union[int, timedelta]) -> None:
project is built and started.
"""
self.set_capability(
SERVER_STARTUP_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
SERVER_STARTUP_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,5 @@ def create_session_timeout(self, value: Union[timedelta, int]) -> None:
with appId: TestCompany.my_app4!App, and processId: 8480).
"""
self.set_capability(
CREATE_SESSION_TIMEOUT, value.microseconds // 1000 if isinstance(value, timedelta) else value
CREATE_SESSION_TIMEOUT, int(value.total_seconds() * 1000) if isinstance(value, timedelta) else value
)
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ def wait_for_app_launch(self, value: Union[timedelta, int]) -> None:
a defined amount of time after an app launch is initiated prior to
attaching to the application session. The limit for this is 50 seconds.
"""
self.set_capability(WAIT_FOR_APP_LAUNCH, value.seconds if isinstance(value, timedelta) else value)
self.set_capability(WAIT_FOR_APP_LAUNCH, value.total_seconds() if isinstance(value, timedelta) else value)