Rebase python3 branch with master

appium/webdriver/appium_connection.py

@@ -13,17 +13,20 @@
 # limitations under the License.
 
 import uuid
-from typing import Any, Dict
+from typing import TYPE_CHECKING, Any, Dict
 
 from selenium.webdriver.remote.remote_connection import RemoteConnection
 
 from appium.common.helper import library_version
 
+if TYPE_CHECKING:
+    from urllib.parse import ParseResult
+
 
 class AppiumConnection(RemoteConnection):
 
     @classmethod
-    def get_remote_connection_headers(cls, parsed_url: str, keep_alive: bool = True) -> Dict[str, Any]:
+    def get_remote_connection_headers(cls, parsed_url: 'ParseResult', keep_alive: bool = True) -> Dict[str, Any]:
         """Override get_remote_connection_headers in RemoteConnection"""
         headers = RemoteConnection.get_remote_connection_headers(parsed_url, keep_alive=keep_alive)
         headers['User-Agent'] = 'appium/python {} ({})'.format(library_version(), headers['User-Agent'])

appium/webdriver/appium_service.py

@@ -170,7 +170,7 @@ def start(self, **kwargs: Any) -> sp.Popen:
         if not self.is_running or (timeout_ms > 0 and not poll_url(host, port, STATUS_URL, timeout_ms)):
             error_msg = f'Appium has failed to start on {host}:{port} within {timeout_ms}ms timeout'
         if error_msg is not None:
-            if stderr == sp.PIPE:
+            if stderr == sp.PIPE and self._process.stderr is not None:
                 err_output = self._process.stderr.read()
                 if err_output:
                     error_msg += f'\nOriginal error: {str(err_output)}'

appium/webdriver/extensions/search_context/android.py

@@ -15,7 +15,7 @@
 # pylint: disable=abstract-method
 
 import json
-from typing import TYPE_CHECKING, List, Optional
+from typing import TYPE_CHECKING, Any, List, Optional
 
 from appium.webdriver.common.mobileby import MobileBy
 
@@ -28,7 +28,8 @@
 class AndroidSearchContext(BaseSearchContext):
     """Define search context for Android"""
 
-    def find_element_by_android_view_matcher(self, name=None, args=None, className=None):
+    def find_element_by_android_view_matcher(
+            self, name: Optional[str] = None, args: Any = None, className: Optional[str] = None) -> 'WebElement':
         """Finds element by [onView](https://developer.android.com/training/testing/espresso/basics) in Android
 
         It works with [Espresso Driver](https://github.com/appium/appium-espresso-driver).
@@ -62,7 +63,7 @@ def find_element_by_android_view_matcher(self, name=None, args=None, className=N
         )
 
     def find_element_by_android_data_matcher(
-            self, name: Optional[str] = None, args: Optional[str] = None, className: Optional[str] = None) -> 'WebElement':
+            self, name: Optional[str] = None, args: Any = None, className: Optional[str] = None) -> 'WebElement':
         """Finds element by [onData](https://medium.com/androiddevelopers/adapterviews-and-espresso-f4172aa853cf) in Android
 
         It works with [Espresso Driver](https://github.com/appium/appium-espresso-driver).
@@ -95,7 +96,7 @@ def find_element_by_android_data_matcher(
         )
 
     def find_elements_by_android_data_matcher(
-            self, name: Optional[str] = None, args: Optional[str] = None, className: Optional[str] = None) -> List['WebElement']:
+            self, name: Optional[str] = None, args: Any = None, className: Optional[str] = None) -> List['WebElement']:
         """Finds elements by [onData](https://medium.com/androiddevelopers/adapterviews-and-espresso-f4172aa853cf) in Android
         It works with [Espresso Driver](https://github.com/appium/appium-espresso-driver).
 
@@ -122,7 +123,7 @@ def find_elements_by_android_data_matcher(
             value=self._build_data_matcher(name=name, args=args, className=className)
         )
 
-    def _build_data_matcher(self, name: Optional[str] = None, args: Optional[str]
+    def _build_data_matcher(self, name: Optional[str] = None, args: Any
                             = None, className: Optional[str] = None) -> str:
         result = {}
 

appium/webdriver/webelement.py

@@ -25,7 +25,7 @@
 
 
 class WebElement(AppiumWebElementSearchContext):
-    def get_attribute(self, name: str) -> Optional[str]:
+    def get_attribute(self, name: str) -> Optional[Union[str, Dict]]:
         """Gets the given attribute or property of the element.
 
         Override for Appium
@@ -211,7 +211,7 @@ def set_value(self, value: str) -> T:
         return self
 
     # Override
-    def send_keys(self, *value):
+    def send_keys(self, *value: str) -> T:
         """Simulates typing into the element.
 
         Args:

test/functional/android/multi_action_tests.py

@@ -64,7 +64,7 @@ def test_actions_with_waits(self) -> None:
         ma.add(a1, a2)
         ma.perform()
 
-    def _move_to_splitting_touches_accros_views(self):
+    def _move_to_splitting_touches_accros_views(self) -> None:
         el1 = self.driver.find_element_by_accessibility_id('Content')
         el2 = self.driver.find_element_by_accessibility_id('Animation')
         self.driver.scroll(el1, el2)

test/functional/android/search_context/find_by_view_matcher_tests.py

@@ -24,36 +24,33 @@
     AndroidSearchContext
 )
 from test.functional.android.helper.test_helper import (
+    BaseTestCase,
     desired_capabilities,
     is_ci
 )
 
 
-class FindByViewMatcherTests(unittest.TestCase):
+class TestFindByViewMatcher(BaseTestCase):
 
-    def setUp(self):
+    # Override
+    def setup_method(self, method) -> None:  # type: ignore
         desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk.zip')
         desired_caps['automationName'] = 'Espresso'
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
         if is_ci():
-            # Take the screenshot to investigate when tests failed only on CI
-            img_path = os.path.join(os.getcwd(), self._testMethodName + '.png')
-            self.driver.get_screenshot_as_file(img_path)
-        self.driver.quit()
+            self.driver.start_recording_screen()
 
-    def test_find_single_element(self):
+    def test_find_single_element(self) -> None:
         el = self.driver.find_element_by_android_view_matcher(
             name='withText', args=['Accessibility'], className='ViewMatchers')
         assert el.text == 'Accessibility'
 
-    def test_find_single_element_ful_class_name(self):
+    def test_find_single_element_ful_class_name(self) -> None:
         el = self.driver.find_element_by_android_view_matcher(
             name='withText', args=['Accessibility'], className='androidx.test.espresso.matcher.ViewMatchers')
         assert el.text == 'Accessibility'
 
-    def test_find_single_element_using_hamcrest_matcher(self):
+    def test_find_single_element_using_hamcrest_matcher(self) -> None:
         el = self.driver.find_element_by_android_view_matcher(
             name='withText',
             args={
@@ -65,13 +62,8 @@ def test_find_single_element_using_hamcrest_matcher(self):
 
     # androidx.test.espresso.AmbiguousViewMatcherException:
     # 'with text: a string containing "Access"' matches multiple views in the hierarchy.
-    def test_find_multiple_elements(self):
+    def test_find_multiple_elements(self) -> None:
         value = AndroidSearchContext()._build_data_matcher(
             name='withSubstring', args=['Access'], className='ViewMatchers')
         with pytest.raises(WebDriverException):
             self.driver.find_elements(by=MobileBy.ANDROID_VIEW_MATCHER, value=value)
-
-
-if __name__ == '__main__':
-    suite = unittest.TestLoader().loadTestsFromTestCase(FindByViewMatcherTests)
-    unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/touch_action_tests.py

@@ -146,7 +146,7 @@ def test_drag_and_drop(self) -> None:
         action.long_press(dd3).move_to(dd2).release().perform()
 
         el = wait_for_element(self.driver, MobileBy.ID, '{}:id/drag_result_text'.format(APIDEMO_PKG_NAME))
-        self.assertTrue('Dropped!' in el.text)
+        assert 'Dropped!' in el.text
 
     def test_driver_drag_and_drop(self) -> None:
         self._move_to_views()
@@ -161,7 +161,7 @@ def test_driver_drag_and_drop(self) -> None:
         self.driver.drag_and_drop(dd3, dd2)
 
         el = wait_for_element(self.driver, MobileBy.ID, '{}:id/drag_result_text'.format(APIDEMO_PKG_NAME))
-        self.assertTrue('Dropped!' in el.text)
+        assert 'Dropped!' in el.text
 
     def test_driver_swipe(self) -> None:
         el = self.driver.find_element_by_accessibility_id('Views')
@@ -175,7 +175,7 @@ def test_driver_swipe(self) -> None:
         el = wait_for_element(self.driver, MobileBy.ACCESSIBILITY_ID, 'ImageView')
         assert el is not None
 
-    def _move_to_views(self):
+    def _move_to_views(self) -> None:
         el1 = self.driver.find_element_by_accessibility_id('Content')
         el2 = self.driver.find_element_by_accessibility_id('Animation')
         self.driver.scroll(el1, el2)
@@ -184,7 +184,7 @@ def _move_to_views(self):
         action = TouchAction(self.driver)
         action.tap(el).perform()
 
-    def _move_to_custom_adapter(self):
+    def _move_to_custom_adapter(self) -> None:
         self._move_to_views()
         action = TouchAction(self.driver)