appium · ki4070ma · Aug 26, 2019 · Jul 7, 2019 · Jul 7, 2019 · Jul 7, 2019
diff --git a/ci-jobs/functional/run_android_test.yml b/ci-jobs/functional/run_android_test.yml
@@ -4,6 +4,7 @@ jobs:
       vmImage: ${{ parameters.vmImage }}
     variables:
       ANDROID_SDK_VERSION: ${{ parameters.sdkVer }}
+      CI: ${{ parameters.ci }}
     steps:
       - template: ./run_appium.yml
       - script: bash ci-jobs/functional/start-emulator.sh
@@ -13,3 +14,6 @@ jobs:
           py.test ${{ parameters.testFiles}} ${{ parameters.pytestOpt }}
         displayName: Run Android functional tests
       - template: ./publish_test_result.yml
+      - template: ./save_appium_log.yml
+        parameters:
+          name: ${{ parameters.name }}
diff --git a/ci-jobs/functional/run_appium.yml b/ci-jobs/functional/run_appium.yml
@@ -3,7 +3,7 @@ steps:
   inputs:
     versionSpec: '11.x'
   displayName: Install Node 11.x
-- script: npm install -g appium --chromedriver_version='2.44'
+- script: npm install -g appium@beta --chromedriver_version='2.44'
   displayName: Install appium
 - task: UsePythonVersion@0
   inputs:
@@ -24,5 +24,5 @@ steps:
     appium --version
     node --version
   displayName: Check versions
-- script: nohup appium --relaxed-security &
+- script: nohup appium --relaxed-security > appium_log.txt &
   displayName: Run Appium in background
diff --git a/ci-jobs/functional/run_ios_test.yml b/ci-jobs/functional/run_ios_test.yml
@@ -2,6 +2,8 @@ jobs:
   - job: ${{ parameters.name }}
     pool:
       vmImage: ${{ parameters.vmImage }}
+    variables:
+      CI: ${{ parameters.ci }}
     steps:
       - template: ./run_appium.yml
       - script: |

diff --git a/ci-jobs/functional/save_appium_log.yml b/ci-jobs/functional/save_appium_log.yml
@@ -0,0 +1,18 @@
+steps:
+- task: CopyFiles@2
+  condition: succeededOrFailed()
+  inputs:
+    contents:
+      '**/appium_log.txt'
+    targetFolder: $(Build.ArtifactStagingDirectory)
+- task: CopyFiles@2
+  condition: succeededOrFailed()
+  inputs:
+    contents:
+      '**/test_*.png'
+    targetFolder: $(Build.ArtifactStagingDirectory)
+- task: PublishBuildArtifacts@1
+  condition: succeededOrFailed()
+  inputs:
+    pathToPublish: $(Build.ArtifactStagingDirectory)
+    artifactName: ${{ parameters.name }}
diff --git a/ci-jobs/functional_test.yml b/ci-jobs/functional_test.yml
@@ -1,24 +1,87 @@
 parameters:
   vmImage: 'macOS-10.14'
   pytestOpt: '--doctest-modules --junitxml=junit/test-results.xml --cov=com --cov-report=xml --cov-report=html'
+  androidSdkVer: 28
+  CI: true
+
+# [Android] Need to fix and add flaky tests for activities_tests, find_by_uiautomator_tests
 
 jobs:
   - template: ./functional/run_ios_test.yml
     parameters:
       name: 'func_test_ios1'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
-      testFiles: 'find_*.py remote_fs_tests.py safari_tests.py'
+      testFiles: 'find_*.py remote_fs_tests.py safari_tests.py execute_driver_tests.py'
+      CI: ${{ parameters.ci }}
   - template: ./functional/run_ios_test.yml
     parameters:
       name: 'func_test_ios2'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
       testFiles: 'applications_tests.py hw_actions_tests.py keyboard_tests.py screen_record_tests.py webdriver_tests.py'
+      CI: ${{ parameters.ci }}
   - template: ./functional/run_android_test.yml
     parameters:
       name: 'func_test_android1'
       vmImage: ${{ parameters.vmImage }}
       pytestOpt: ${{ parameters.pytestOpt }}
-      testFiles: 'location_tests.py'
-      sdkVer: 28
+      testFiles: 'device_time_tests.py find_by_accessibility_id_tests.py find_by_image_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android2'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'ime_tests.py keyboard_tests.py location_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android3'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'chrome_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android4'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'finger_print_tests.py screen_record_tests.py settings_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android5'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'context_switching_tests.py remote_fs_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android6'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'webdriver_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android7'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'applications_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
+  - template: ./functional/run_android_test.yml
+    parameters:
+      name: 'func_test_android8'
+      vmImage: ${{ parameters.vmImage }}
+      pytestOpt: ${{ parameters.pytestOpt }}
+      testFiles: 'network_connection_tests.py'
+      sdkVer: ${{ parameters.androidSdkVer }}
+      CI: ${{ parameters.ci }}
diff --git a/test/functional/android/activities_tests.py b/test/functional/android/activities_tests.py
@@ -18,9 +18,10 @@
 from appium import webdriver
    
 from .helper import desired_capabilities
+from .helper.test_helper import BaseTestCase
 
 
-class ActivitiesTests(unittest.TestCase):
+class ActivitiesTests(BaseTestCase):
     def setUp(self):
         desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)

diff --git a/test/functional/android/applications_tests.py b/test/functional/android/applications_tests.py
@@ -16,19 +16,12 @@
 import unittest
 from time import sleep
 
-from appium import webdriver
 from appium.webdriver.applicationstate import ApplicationState
 
-from .helper import desired_capabilities
+from .helper.test_helper import BaseTestCase
 
 
-class ApplicationsTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
+class ApplicationsTests(BaseTestCase):
 
     def test_background_app(self):
         self.driver.background_app(1)

diff --git a/test/functional/android/chrome_tests.py b/test/functional/android/chrome_tests.py
@@ -23,7 +23,9 @@ def setUp(self):
             'platformName': 'Android',
             'platformVersion': '9',
             'deviceName': 'Android Emulator',
-            'browserName': 'Chrome'
+            'browserName': 'Chrome',
+            'uiautomator2ServerInstallTimeout': 120000,
+            'adbExecTimeout': 120000
         }
         self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
 

diff --git a/test/functional/android/device_time_tests.py b/test/functional/android/device_time_tests.py
@@ -17,19 +17,10 @@
 
 from dateutil.parser import parse
 
-from appium import webdriver
+from .helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class DeviceTimeTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class DeviceTimeTests(BaseTestCase):
     def test_device_time(self):
         date_time = self.driver.device_time
         # convert to date ought to work

diff --git a/test/functional/android/find_by_accessibility_id_tests.py b/test/functional/android/find_by_accessibility_id_tests.py
@@ -14,38 +14,36 @@
 
 import unittest
 
-from appium import webdriver
+from appium.webdriver.common.mobileby import MobileBy
 
-from .helper import desired_capabilities
+from .helper.test_helper import BaseTestCase, is_ci, wait_for_element
 
 
-class FindByAccessibilityIDTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
-
+class FindByAccessibilityIDTests(BaseTestCase):
     def test_find_single_element(self):
-        self.driver.find_element_by_android_uiautomator('new UiSelector().text("Accessibility")').click()
-        self.driver.find_element_by_android_uiautomator('new UiSelector().text("Accessibility Node Querying")').click()
-        el = self.driver.find_element_by_accessibility_id('Task Take out Trash')
+        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.ACCESSIBILITY_ID, 'Task Take out Trash')
         self.assertIsNotNone(el)
 
     def test_find_multiple_elements(self):
         els = self.driver.find_elements_by_accessibility_id('Accessibility')
         self.assertIsInstance(els, list)
 
     def test_element_find_single_element(self):
-        self.driver.find_element_by_android_uiautomator('new UiSelector().text("Accessibility")').click()
-        self.driver.find_element_by_android_uiautomator('new UiSelector().text("Accessibility Node Querying")').click()
-        el = self.driver.find_element_by_class_name('android.widget.ListView')
+        if is_ci():
+            self.skipTest('Need to fix flaky test during running on CI')
+        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')
 
         sub_el = el.find_element_by_accessibility_id('Task Take out Trash')
         self.assertIsNotNone(sub_el)
 
     def test_element_find_multiple_elements(self):
+        wait_for_element(self.driver, MobileBy.CLASS_NAME, 'android.widget.ListView')
         el = self.driver.find_element_by_class_name('android.widget.ListView')
 
         sub_els = el.find_elements_by_accessibility_id('Animation')

diff --git a/test/functional/android/find_by_uiautomator_tests.py b/test/functional/android/find_by_uiautomator_tests.py
@@ -14,19 +14,10 @@
 
 import unittest
 
-from appium import webdriver
+from .helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class FindByUIAutomatorTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class FindByUIAutomatorTests(BaseTestCase):
     def test_find_single_element(self):
         el = self.driver.find_element_by_android_uiautomator('new UiSelector().text("Animation")')
         self.assertIsNotNone(el)

diff --git a/test/functional/android/finger_print_tests.py b/test/functional/android/finger_print_tests.py
@@ -15,19 +15,10 @@
 
 import unittest
 
-from appium import webdriver
+from .helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class FingerPrintTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class FingerPrintTests(BaseTestCase):
     def test_finger_print(self):
         result = self.driver.finger_print(1)
         self.assertEqual(None, result)

diff --git a/test/functional/android/helper/desired_capabilities.py b/test/functional/android/helper/desired_capabilities.py
@@ -28,7 +28,9 @@ def get_desired_capabilities(app):
         'deviceName': 'Android Emulator',
         'app': PATH('../../apps/{}'.format(app)),
         'newCommandTimeout': 240,
-        'automationName': 'UIAutomator2'
+        'automationName': 'UIAutomator2',
+        'uiautomator2ServerInstallTimeout': 120000,
+        'adbExecTimeout': 120000
     }
 
     return desired_caps
diff --git a/test/functional/android/helper/test_helper.py b/test/functional/android/helper/test_helper.py
@@ -12,11 +12,19 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+import os
+import unittest
+
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
+from appium import webdriver
+
+from . import desired_capabilities
+
 # the emulator is sometimes slow and needs time to think
-SLEEPY_TIME = 3
+SLEEPY_TIME = 10
 
 
 def wait_for_element(driver, locator, value, timeout=SLEEPY_TIME):
@@ -38,3 +46,24 @@ def wait_for_element(driver, locator, value, timeout=SLEEPY_TIME):
     return WebDriverWait(driver, timeout).until(
         EC.presence_of_element_located((locator, value))
     )
+
+
+def is_ci():
+    """Returns if current execution is running on CI
+
+    Returns:
+        bool: `True` if current executions is on CI
+    """
+    return os.getenv('CI', 'false') == 'true'
+
+
+class BaseTestCase(unittest.TestCase):
+
+    def setUp(self):
+        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
+        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
+
+    def tearDown(self):
+        img_path = os.path.join(os.getcwd(), self._testMethodName + '.png')
+        self.driver.get_screenshot_as_file(img_path)
+        self.driver.quit()
diff --git a/test/functional/android/hw_actions_tests.py b/test/functional/android/hw_actions_tests.py
@@ -14,22 +14,15 @@
 # limitations under the License.
 
 import unittest
+from time import sleep
 
-from appium import webdriver
+from .helper.test_helper import BaseTestCase
 
-from .helper import desired_capabilities
-
-
-class HwActionsTests(unittest.TestCase):
-    def setUp(self):
-        desired_caps = desired_capabilities.get_desired_capabilities('ApiDemos-debug.apk')
-        self.driver = webdriver.Remote('http://localhost:4723/wd/hub', desired_caps)
-
-    def tearDown(self):
-        self.driver.quit()
 
+class HwActionsTests(BaseTestCase):
     def test_lock(self):
         self.driver.lock(-1)
+        sleep(10)
         try:
             self.assertTrue(self.driver.is_locked())
         finally: