Sitelet https://github.com/appium/python-client/pull/1010/files
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/functional-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,10 @@ jobs:
appium plugin install execute-driver
nohup appium --use-plugins=images,execute-driver --relaxed-security --log-timestamp --log-no-colors > appium.log &

- name: Set up Python 3.9
- name: Set up Python 3.12

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this plugin allow to just set the version to "latest"?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unfortunately, it looks like no. I tried the latest once but may have failed at that time. After removing the version, I installed v3.8.

uses: actions/setup-python@v3
with:
python-version: 3.9
python-version: 3.12

- run: |
# Separate 'run' creates differnet pipenv env. Does them in one run for now.
Expand Down Expand Up @@ -97,16 +97,16 @@ jobs:
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/context_switching_tests.py test/functional/android/remote_fs_tests.py
# name: func_test_android5
- 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/context_switching_tests.py 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/applications_tests.py
name: func_test_android7
# - target: test/functional/android/network_connection_tests.py test/functional/android/log_event_tests.py test/functional/android/activities_tests.py test/functional/android/hw_actions_tests.py
# name: func_test_android8
- target: test/functional/android/network_connection_tests.py test/functional/android/log_event_tests.py test/functional/android/activities_tests.py test/functional/android/hw_actions_tests.py
name: func_test_android8

runs-on: ubuntu-latest

Expand Down Expand Up @@ -162,10 +162,10 @@ jobs:
disable-animations: false
script: echo "Generated AVD snapshot for caching."

- name: Set up Python 3.9
- name: Set up Python 3.12
uses: actions/setup-python@v3
with:
python-version: 3.9
python-version: 3.12

- name: run tests
uses: reactivecircus/android-emulator-runner@v2
Expand Down
6 changes: 0 additions & 6 deletions azure-pipelines.yml

This file was deleted.

5 changes: 0 additions & 5 deletions ci-jobs/functional/ios_setup.yml

This file was deleted.

11 changes: 0 additions & 11 deletions ci-jobs/functional/publish_test_result.yml

This file was deleted.

26 changes: 0 additions & 26 deletions ci-jobs/functional/run_android_test.yml

This file was deleted.

25 changes: 0 additions & 25 deletions ci-jobs/functional/run_ios_test.yml

This file was deleted.

18 changes: 0 additions & 18 deletions ci-jobs/functional/save_appium_log.yml

This file was deleted.

28 changes: 0 additions & 28 deletions ci-jobs/functional/setup_appium.yml

This file was deleted.

58 changes: 0 additions & 58 deletions ci-jobs/functional/start-emulator.sh

This file was deleted.

32 changes: 0 additions & 32 deletions ci-jobs/functional_test.yml

This file was deleted.

12 changes: 0 additions & 12 deletions ci-jobs/scripts/start_server.sh

This file was deleted.

2 changes: 1 addition & 1 deletion test/functional/android/activities_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_start_activity_other_app(self) -> None:
self.driver.execute_script(
'mobile: startActivity',
{
'component': f'{APIDEMO_PKG_NAME}/com.android.deskclock.DeskClock',
'component': 'com.google.android.deskclock/com.android.deskclock.DeskClock',
},
)
self._assert_activity_contains('Clock')
Expand Down
7 changes: 4 additions & 3 deletions test/functional/android/chrome_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@ def teardown_method(self) -> None:
self.driver.quit()

def test_find_single_element(self) -> None:
self.driver.get(f'{SERVER_URL_BASE}/test/guinea-pig')
self.driver.find_element(by=AppiumBy.LINK_TEXT, value='i am a link').click()
e = self.driver.find_element(by=AppiumBy.XPATH, value='//body')
assert e.text == ''

assert 'I am some other page content' in self.driver.page_source
# Chrome browser's default page
assert '<html><head></head><body></body></html>' in self.driver.page_source
6 changes: 4 additions & 2 deletions test/functional/android/finger_print_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,7 @@

class TestFingerPrint(BaseTestCase):
def test_finger_print(self) -> None:
result = self.driver.finger_print(1)
assert result is None
try:
self.driver.finger_print(1)
except Exception:
assert False, "Sould not raise any exceptions"
7 changes: 4 additions & 3 deletions test/functional/android/network_connection_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ def test_get_network_connection(self) -> None:

@pytest.mark.skipif(condition=is_ci(), reason='Need to fix flaky test during running on CI')
def test_set_network_connection(self) -> None:
nc = self.driver.set_network_connection(ConnectionType.DATA_ONLY)
assert isinstance(nc, int)
assert nc == ConnectionType.DATA_ONLY
try:
self.driver.set_network_connection(ConnectionType.DATA_ONLY)
except Exception:
assert False, "Should not raise any exceptions"

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

you could also use pytest.fail

6 changes: 5 additions & 1 deletion test/functional/android/remote_fs_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ def test_pull_folder(self) -> None:
folder = self.driver.pull_folder(dest_dir)

with ZipFile(BytesIO(base64.b64decode(folder))) as fzip:
for filename in ['1.txt', '2.txt']:
for filename in ['tmp/1.txt', 'tmp/2.txt']:
# e.g. in the fzip.namelist():
# ['tmp/', 'tmp/.studio/', 'tmp/.studio/process-tracker', 'tmp/1.txt', 'tmp/2.txt',
# 'tmp/chrome-command-line', 'tmp/espresso.apppackage', 'tmp/remote.txt',
# 'tmp/test_file.txt', 'tmp/test_image.jpg', 'tmp/test_push_file.txt']
assert filename in fzip.namelist()

def test_push_file_with_src_path(self) -> None:
Expand Down