Merge branch 'master' into master

appium · Oct 2, 2024 · 1a26a13 · 1a26a13
2 parents e168586 + e4b40ae
commit 1a26a13
Show file tree

Hide file tree

Showing 43 changed files with 446 additions and 1,141 deletions.
diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
@@ -18,12 +18,8 @@ jobs:
       fail-fast: false
       matrix:
         test_targets:
-          - target: test/functional/ios/search_context/find_by_*.py test/functional/ios/remote_fs_tests.py test/functional/ios/safari_tests.py test/functional/ios/execute_driver_tests.py
+          - target: test/functional/ios/safari_tests.py
             name: func_test_ios1
-          - target: test/functional/ios/applications_tests.py test/functional/ios/hw_actions_tests.py test/functional/ios/keyboard_tests.py
-            name: func_test_ios2
-          - target: test/functional/ios/screen_record_tests.py test/functional/ios/webdriver_tests.py
-            name: func_test_ios3
 
     runs-on: macos-14
 
@@ -91,20 +87,8 @@ jobs:
       fail-fast: false
       matrix:
         test_targets:
-          - target: test/functional/android/device_time_tests.py test/functional/android/search_context/find_by_*.py
+          - target: test/functional/android/appium_service_tests.py test/functional/android/chrome_tests.py
             name: func_test_android1
-          - target: test/functional/android/keyboard_tests.py test/functional/android/location_tests.py
-            name: func_test_android2
-          - target: test/functional/android/appium_service_tests.py
-            name: func_test_android3
-          - target: test/functional/android/finger_print_tests.py test/functional/android/screen_record_tests.py test/functional/android/settings_tests.py test/functional/android/chrome_tests.py
-            name: func_test_android4
-          - target: test/functional/android/remote_fs_tests.py
-            name: func_test_android5
-          - target: test/functional/android/common_tests.py test/functional/android/webelement_tests.py
-            name: func_test_android6
-          - target: test/functional/android/network_connection_tests.py test/functional/android/log_event_tests.py test/functional/android/hw_actions_tests.py
-            name: func_test_android8
 
     runs-on: ubuntu-latest
 
@@ -130,9 +114,8 @@ jobs:
     - run: |
         appium driver install uiautomator2
         appium driver install espresso
-        appium plugin install images
         appium plugin install execute-driver
-        nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
+        nohup appium --use-plugins=execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
 
     - name: Enable KVM group perms
       run: |
@@ -234,7 +217,7 @@ jobs:
         echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
         sudo udevadm control --reload-rules
         sudo udevadm trigger --name-match=kvm
-  
+
     - name: Set up Python 3.12
       uses: actions/setup-python@v3
       with:
@@ -247,7 +230,7 @@ jobs:
 
     - name: Install Appium
       run: npm install --location=global appium
-    
+
     - name: Install Android drivers and Run Appium
       if: matrix.e2e-tests == 'flutter-android'
       run: |

diff --git a/Pipfile b/Pipfile
@@ -15,7 +15,7 @@ pylint-quotes = "~=0.2.3"
 pytest = "~=8.3"
 pytest-cov = "~=4.1"
 python-dateutil = "~=2.9"
-tox = "~=4.20"
+tox = "~=4.21"
 types-python-dateutil = "~=2.9"
 
 [packages]

diff --git a/test/functional/android/common_tests.py b/test/functional/android/common_tests.py
diff --git a/test/functional/android/device_time_tests.py b/test/functional/android/device_time_tests.py
diff --git a/test/functional/android/file/find_by_image_failure.png b/test/functional/android/file/find_by_image_failure.png
diff --git a/test/functional/android/file/find_by_image_success.png b/test/functional/android/file/find_by_image_success.png
diff --git a/test/functional/android/file/test_file.txt b/test/functional/android/file/test_file.txt
diff --git a/test/functional/android/file/test_image.jpg b/test/functional/android/file/test_image.jpg
diff --git a/test/functional/android/finger_print_tests.py b/test/functional/android/finger_print_tests.py
diff --git a/test/functional/android/hw_actions_tests.py b/test/functional/android/hw_actions_tests.py
diff --git a/test/functional/android/keyboard_tests.py b/test/functional/android/keyboard_tests.py
diff --git a/test/functional/android/location_tests.py b/test/functional/android/location_tests.py
diff --git a/test/functional/android/log_event_tests.py b/test/functional/android/log_event_tests.py
diff --git a/test/functional/android/network_connection_tests.py b/test/functional/android/network_connection_tests.py
diff --git a/test/functional/android/remote_fs_tests.py b/test/functional/android/remote_fs_tests.py