chore: Fix iOS app management functional tests (appium#575)

* Added sleep to wait the app has gone

* Upgrade AndroidSDK to 30 from 27

* Added sleep to ios tc

* Fix android activities test

* Revert android sdk ver

* Used timer instead of fixed wait time

* Created wait_for

* Update test/functional/test_helper.py

* review comments

* review comments

* Extend callable type

* fix

* review comment

* review comment

* review comment

* fix comment

Author: ki4070ma

test/functional/android/activities_tests.py

@@ -32,8 +32,8 @@ def test_start_activity_other_app(self) -> None:
         self.driver.start_activity(APIDEMO_PKG_NAME, ".ApiDemos")
         self._assert_activity_contains('Demos')
 
-        self.driver.start_activity("com.android.calculator2", ".Calculator")
-        self._assert_activity_contains('Calculator')
+        self.driver.start_activity("com.google.android.deskclock", "com.android.deskclock.DeskClock")
+        self._assert_activity_contains('Clock')
 
     def _assert_activity_contains(self, activity: str) -> None:
         current = self.driver.current_activity

test/functional/ios/applications_tests.py

@@ -14,6 +14,7 @@
 
 from appium.webdriver.applicationstate import ApplicationState
 from test.functional.ios.helper.test_helper import BaseTestCase
+from test.functional.test_helper import wait_for_condition
 
 from .helper import desired_capabilities
 
@@ -25,6 +26,8 @@ def test_app_management(self) -> None:
             return
         assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) == ApplicationState.RUNNING_IN_FOREGROUND
         self.driver.background_app(-1)
-        assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) < ApplicationState.RUNNING_IN_FOREGROUND
+        assert wait_for_condition(
+            lambda: self.driver.query_app_state(desired_capabilities.BUNDLE_ID) < ApplicationState.RUNNING_IN_FOREGROUND
+        ), "The app didn't go to background."
         self.driver.activate_app(desired_capabilities.BUNDLE_ID)
         assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) == ApplicationState.RUNNING_IN_FOREGROUND

test/functional/ios/webdriver_tests.py

@@ -20,7 +20,7 @@
 from appium import webdriver
 from appium.webdriver.applicationstate import ApplicationState
 from test.functional.ios.helper.test_helper import BaseTestCase
-from test.functional.test_helper import get_available_from_port_range
+from test.functional.test_helper import get_available_from_port_range, wait_for_condition
 
 from ..test_helper import is_ci
 from .helper import desired_capabilities
@@ -60,7 +60,11 @@ def test_app_management(self) -> None:
             return
         assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) == ApplicationState.RUNNING_IN_FOREGROUND
         self.driver.background_app(-1)
-        assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) < ApplicationState.RUNNING_IN_FOREGROUND
+        print(self.driver.query_app_state(desired_capabilities.BUNDLE_ID) < ApplicationState.RUNNING_IN_FOREGROUND)
+        assert wait_for_condition(
+            lambda: self.driver.query_app_state(desired_capabilities.BUNDLE_ID)
+            < ApplicationState.RUNNING_IN_FOREGROUND,
+        ), "The app didn't go to background."
         self.driver.activate_app(desired_capabilities.BUNDLE_ID)
         assert self.driver.query_app_state(desired_capabilities.BUNDLE_ID) == ApplicationState.RUNNING_IN_FOREGROUND
 

test/functional/test_helper.py

@@ -1,5 +1,8 @@
 import os
 import socket
+import time
+from time import sleep
+from typing import Any, Callable
 
 
 class NoAvailablePortError(Exception):
@@ -37,3 +40,32 @@ def is_ci() -> bool:
         `True` if current executions is on CI
     """
     return os.getenv('CI', 'false') == 'true'
+
+
+def wait_for_condition(method: Callable, timeout_sec: float = 5, interval_sec: float = 1) -> Any:
+    """Wait while `method` returns the built-in objects considered false
+
+    https://docs.python.org/3/library/stdtypes.html#truth-value-testing
+
+    Args:
+        method: The target method to be waited
+        timeout: The timeout to be waited (sec.)
+        interval_sec: The interval for wait (sec.)
+
+    Returns:
+        Any: value which `method` returns
+
+    Raises:
+        ValueError: When interval isn't more than 0
+
+    """
+    if interval_sec < 0:
+        raise ValueError('interval_sec needs to be not less than 0')
+
+    started = time.time()
+    while time.time() - started <= timeout_sec:
+        result = method()
+        if result:
+            break
+        sleep(interval_sec)
+    return result