Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Android] Introduces API 34 emulators for tests #4804

Closed
wants to merge 58 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
dec3d69
Merge remote-tracking branch 'upstream/main' into camx_occ
camsim99 May 1, 2023
0e0333b
Merge remote-tracking branch 'upstream/main'
camsim99 May 2, 2023
bd7ac99
Merge remote-tracking branch 'upstream/main'
camsim99 May 3, 2023
5c3363b
Merge remote-tracking branch 'upstream/main'
camsim99 May 10, 2023
fed9621
Undo changes
camsim99 May 10, 2023
5aabe34
Merge remote-tracking branch 'upstream/main'
camsim99 May 12, 2023
2b9a352
Merge remote-tracking branch 'upstream/main'
camsim99 May 25, 2023
a1173da
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cbc3d6b
Merge remote-tracking branch 'upstream/main'
camsim99 May 30, 2023
cae5a4c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 1, 2023
72283db
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
166a77c
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 5, 2023
399780e
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 14, 2023
8d5d0e7
Merge remote-tracking branch 'upstream/main'
camsim99 Jun 26, 2023
084d960
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 12, 2023
d2a59ac
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
a1422bf
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 17, 2023
bdd87a6
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 18, 2023
137a28b
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 19, 2023
bc0db5a
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 20, 2023
d04b466
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 21, 2023
a9cfe87
Merge remote-tracking branch 'upstream/main'
camsim99 Jul 24, 2023
a32def1
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 2, 2023
4785148
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 14, 2023
7a8fc69
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
b02e15f
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 15, 2023
c6e5868
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 17, 2023
0c0065a
Merge remote-tracking branch 'upstream/main'
camsim99 Aug 28, 2023
bcb62ad
Bump tests
camsim99 Aug 28, 2023
a5e9657
More 34 bumps
camsim99 Aug 28, 2023
f5d09ac
Revert "More 34 bumps"
camsim99 Aug 28, 2023
a380e73
Merge branch 'main' into test_34
camsim99 Aug 28, 2023
d8243be
Merge branch 'main' into test_34
camsim99 Aug 29, 2023
451b051
Add todo
camsim99 Aug 30, 2023
6b988c4
test waiting for desc in quick_actions_android test
camsim99 Aug 30, 2023
ca7e5ff
Merge branch 'test_34' of github.com:camsim99/packages into test_34
camsim99 Aug 30, 2023
62c3ccc
Add test for app sentinel alone
camsim99 Aug 31, 2023
0fd0887
Push for testing
camsim99 Aug 31, 2023
1bf1063
Correct import
camsim99 Aug 31, 2023
54489a7
Correct import
camsim99 Aug 31, 2023
6f838a3
Fix check
camsim99 Sep 1, 2023
5ae5a04
Debug fileselector
camsim99 Sep 1, 2023
2cfb16c
Rearrange QuickActionsTest
camsim99 Sep 5, 2023
37f4863
test intended behavior
camsim99 Sep 5, 2023
17e85e5
Try adding permission intent
camsim99 Sep 5, 2023
51b62fc
add comment
camsim99 Sep 5, 2023
a351c04
Undo changes to file selector test
camsim99 Sep 5, 2023
2406165
try screenshot
camsim99 Sep 6, 2023
ad49843
Correct method
camsim99 Sep 6, 2023
067527a
Merge branch 'main' into test_34
camsim99 Sep 11, 2023
4104534
Merge remote-tracking branch 'upstream/main' into test_34
camsim99 Oct 10, 2023
6c59c89
Bump everything to 34
camsim99 Oct 10, 2023
b89a022
Merge branch 'test_34' of github.com:camsim99/packages into test_34
camsim99 Oct 10, 2023
8fa35af
Correct name
camsim99 Oct 10, 2023
7828641
Remove bringup
camsim99 Oct 10, 2023
b80bb26
Remove build.gradle changes
camsim99 Oct 11, 2023
3ea75f0
Merge remote-tracking branch 'upstream/main' into test_34
camsim99 Oct 11, 2023
b0e968c
Exclude espresso
camsim99 Oct 11, 2023
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
48 changes: 23 additions & 25 deletions .ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ platform_properties:
device_type: none
dependencies: >-
[
{"dependency": "android_sdk", "version": "version:33v6"},
{"dependency": "android_sdk", "version": "version:34v1"},
{"dependency": "open_jdk", "version": "version:17"},
{"dependency": "curl", "version": "version:7.64.0"}
]
Expand Down Expand Up @@ -250,7 +250,7 @@ targets:
# web_benchmarks needs Chrome.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "android_virtual_device", "version": "34"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand All @@ -267,7 +267,7 @@ targets:
# See comments on 'master' version above.
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"},
{"dependency": "android_virtual_device", "version": "34"},
{"dependency": "clang", "version": "git_revision:5d5aba78dbbee75508f01bcaa69aedb2ab79065a"},
{"dependency": "chrome_and_driver", "version": "version:114.0"}
]
Expand Down Expand Up @@ -312,7 +312,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_2 master
Expand All @@ -325,7 +325,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_3 master
Expand All @@ -338,7 +338,7 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_4 master
Expand All @@ -351,7 +351,7 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_5 master
Expand All @@ -364,7 +364,7 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_6 master
Expand All @@ -377,35 +377,33 @@ targets:
package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_api_33_shard_1 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: android_platform_tests_api_33.yaml
target_file: android_platform_tests_api_33_avd.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_api_33_shard_2 master
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: android_platform_tests_api_33.yaml
target_file: android_platform_tests_api_33_avd.yaml
channel: master
version_file: flutter_master.version
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_1 stable
Expand All @@ -419,7 +417,7 @@ targets:
package_sharding: "--shardIndex 0 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_2 stable
Expand All @@ -433,7 +431,7 @@ targets:
package_sharding: "--shardIndex 1 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_3 stable
Expand All @@ -447,7 +445,7 @@ targets:
package_sharding: "--shardIndex 2 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_4 stable
Expand All @@ -461,7 +459,7 @@ targets:
package_sharding: "--shardIndex 3 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_5 stable
Expand All @@ -475,7 +473,7 @@ targets:
package_sharding: "--shardIndex 4 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_shard_6 stable
Expand All @@ -489,35 +487,35 @@ targets:
package_sharding: "--shardIndex 5 --shardCount 6"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_api_33_shard_1 stable
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: android_platform_tests_api_33.yaml
target_file: android_platform_tests_api_33_avd.yaml
channel: master
version_file: flutter_stable.version
package_sharding: "--shardIndex 0 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

- name: Linux_android android_platform_tests_api_33_shard_2 stable
recipe: packages/packages
timeout: 60
bringup: true
properties:
target_file: android_platform_tests_api_33.yaml
target_file: android_platform_tests_api_33_avd.yaml
channel: master
version_file: flutter_stable.version
package_sharding: "--shardIndex 1 --shardCount 2"
dependencies: >-
[
{"dependency": "android_virtual_device", "version": "33"}
{"dependency": "android_virtual_device", "version": "34"}
]

# Device versions of Android integration tests, run via FTL.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ void main() {

/// Verify a file called [name] in [directory] by recreating it with test
/// contents when necessary.
// TODO(camsim99): Make this use an in-memory file system instead of writing to disk.
void _verifySampleFile(Directory? directory, String name) {
expect(directory, isNotNull);
if (directory == null) {
Expand Down
1 change: 1 addition & 0 deletions script/configs/still_requires_api_33_avd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
- file_selector
- quick_actions
- webview_flutter
- espresso