Merge branch 'master' into python3

Author: ki4070ma

appium/webdriver/extensions/search_context/android.py

@@ -98,6 +98,7 @@ def find_element_by_android_data_matcher(
     def find_elements_by_android_data_matcher(
             self, name: Optional[str] = None, args: Optional[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).
 
         Args:

test/functional/android/context_switching_tests.py

@@ -44,6 +44,7 @@ def test_actually_in_webview(self) -> None:
         el = self.driver.find_element_by_xpath("//h1[contains(., 'This is my way')]")
         assert el is not None
 
+
     def test_move_back_to_native_context(self) -> None:
         self._enter_webview()
         self.driver.switch_to.context(None)

test/functional/android/network_connection_tests.py

@@ -17,7 +17,6 @@
 
 from appium.webdriver.connectiontype import ConnectionType
 
-from ..test_helper import is_ci
 from .helper.test_helper import BaseTestCase
 
 

test/functional/android/search_context/find_by_accessibility_id_tests.py

@@ -19,7 +19,6 @@
     BaseTestCase,
     wait_for_element
 )
-from test.functional.test_helper import is_ci
 
 
 class TestFindByAccessibilityID(BaseTestCase):
@@ -39,7 +38,7 @@ def test_element_find_single_element(self) -> None:
         wait_for_element(self.driver, MobileBy.ANDROID_UIAUTOMATOR, 'new UiSelector().text("Accessibility")').click()
         wait_for_element(self.driver, MobileBy.ANDROID_UIAUTOMATOR,
                          'new UiSelector().text("Accessibility Node Querying")').click()
-        el = wait_for_element(self.driver, MobileBy.CLASS_NAME, 'android.widget.ListView')
+        el = wait_for_element(self.driver, MobileBy.ACCESSIBILITY_ID, 'Task Take out Trash')
 
         sub_el = el.find_element_by_accessibility_id('Task Take out Trash')
         assert sub_el is not None

test/functional/android/search_context/find_by_image_tests.py

@@ -14,9 +14,7 @@
 
 import base64
 
-import pytest
 from selenium.common.exceptions import NoSuchElementException, TimeoutException
-from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
@@ -43,7 +41,6 @@ def teardown_method(self) -> None:
 
     def test_find_based_on_image_template(self) -> None:
         image_path = desired_capabilities.PATH('file/find_by_image_success.png')
-        print(image_path)
         with open(image_path, 'rb') as png_file:
             b64_data = base64.b64encode(png_file.read()).decode('UTF-8')