Skip to content

Commit 1a26a13

Browse files
authored
Merge branch 'master' into master
2 parents e168586 + e4b40ae commit 1a26a13

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+446
-1141
lines changed

.github/workflows/functional-test.yml

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,8 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
test_targets:
21-
- 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
21+
- target: test/functional/ios/safari_tests.py
2222
name: func_test_ios1
23-
- target: test/functional/ios/applications_tests.py test/functional/ios/hw_actions_tests.py test/functional/ios/keyboard_tests.py
24-
name: func_test_ios2
25-
- target: test/functional/ios/screen_record_tests.py test/functional/ios/webdriver_tests.py
26-
name: func_test_ios3
2723

2824
runs-on: macos-14
2925

@@ -91,20 +87,8 @@ jobs:
9187
fail-fast: false
9288
matrix:
9389
test_targets:
94-
- target: test/functional/android/device_time_tests.py test/functional/android/search_context/find_by_*.py
90+
- target: test/functional/android/appium_service_tests.py test/functional/android/chrome_tests.py
9591
name: func_test_android1
96-
- target: test/functional/android/keyboard_tests.py test/functional/android/location_tests.py
97-
name: func_test_android2
98-
- target: test/functional/android/appium_service_tests.py
99-
name: func_test_android3
100-
- 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
101-
name: func_test_android4
102-
- target: test/functional/android/remote_fs_tests.py
103-
name: func_test_android5
104-
- target: test/functional/android/common_tests.py test/functional/android/webelement_tests.py
105-
name: func_test_android6
106-
- target: test/functional/android/network_connection_tests.py test/functional/android/log_event_tests.py test/functional/android/hw_actions_tests.py
107-
name: func_test_android8
10892

10993
runs-on: ubuntu-latest
11094

@@ -130,9 +114,8 @@ jobs:
130114
- run: |
131115
appium driver install uiautomator2
132116
appium driver install espresso
133-
appium plugin install images
134117
appium plugin install execute-driver
135-
nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
118+
nohup appium --use-plugins=execute-driver --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium.log &
136119
137120
- name: Enable KVM group perms
138121
run: |
@@ -234,7 +217,7 @@ jobs:
234217
echo 'KERNEL=="kvm", GROUP="kvm", MODE="0666", OPTIONS+="static_node=kvm"' | sudo tee /etc/udev/rules.d/99-kvm4all.rules
235218
sudo udevadm control --reload-rules
236219
sudo udevadm trigger --name-match=kvm
237-
220+
238221
- name: Set up Python 3.12
239222
uses: actions/setup-python@v3
240223
with:
@@ -247,7 +230,7 @@ jobs:
247230

248231
- name: Install Appium
249232
run: npm install --location=global appium
250-
233+
251234
- name: Install Android drivers and Run Appium
252235
if: matrix.e2e-tests == 'flutter-android'
253236
run: |

Pipfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ pylint-quotes = "~=0.2.3"
1515
pytest = "~=8.3"
1616
pytest-cov = "~=4.1"
1717
python-dateutil = "~=2.9"
18-
tox = "~=4.20"
18+
tox = "~=4.21"
1919
types-python-dateutil = "~=2.9"
2020

2121
[packages]

test/functional/android/common_tests.py

Lines changed: 0 additions & 58 deletions
This file was deleted.

test/functional/android/device_time_tests.py

Lines changed: 0 additions & 25 deletions
This file was deleted.
-24.7 KB
Binary file not shown.
-2.51 KB
Binary file not shown.

test/functional/android/file/test_file.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.
-20.9 KB
Binary file not shown.

test/functional/android/finger_print_tests.py

Lines changed: 0 additions & 24 deletions
This file was deleted.

test/functional/android/hw_actions_tests.py

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)