Skip to content

Commit a489d49

Browse files
authored
[Android][webview_flutter] Run integration tests on emulators running Android 34 (flutter#6499)
Changes webview_flutter , webview_flutter_android tests to run on emulators running SDK 34 for Android. I also 1. Changed all `unawaited` calls in non-legacy tests to `await`. I believe several of the setup steps need to be completed before running checks based on testing, so this should leave the tests safer overall. 2. Changing the integration test directory structures look like what is described in [the integration_test packages instructions](https://github.com/flutter/flutter/blob/master/packages/integration_test/README.md#package-structure). Without changing the package to this structure, CI seemed to run the tests in parallel. I am still trying to figure out why this is but no longer want to block this PR. Also removes shards for testing packages against Android 33 since no packages are running on emulators running Android 33 anymore. Fixes flutter#140001. Fixes flutter#137083.
1 parent f18b895 commit a489d49

File tree

8 files changed

+250
-375
lines changed

8 files changed

+250
-375
lines changed

.ci.yaml

Lines changed: 0 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -394,17 +394,13 @@ targets:
394394
"CHANNEL": "stable"
395395
}
396396
397-
# All of the Linux_android android_platform_tests shards have the same
398-
# dependency list, despite some running on Android 33 AVDs versus 34.
399-
# See https://github.com/flutter/flutter/issues/137082 for context.
400397
- name: Linux_android android_platform_tests_shard_1 master
401398
recipe: packages/packages
402399
timeout: 60
403400
properties:
404401
target_file: android_platform_tests.yaml
405402
channel: master
406403
version_file: flutter_master.version
407-
# set up for 34
408404
package_sharding: "--shardIndex 0 --shardCount 6"
409405
dependencies: >-
410406
[
@@ -423,7 +419,6 @@ targets:
423419
target_file: android_platform_tests.yaml
424420
channel: master
425421
version_file: flutter_master.version
426-
# set up for 34
427422
package_sharding: "--shardIndex 1 --shardCount 6"
428423
dependencies: >-
429424
[
@@ -442,7 +437,6 @@ targets:
442437
target_file: android_platform_tests.yaml
443438
channel: master
444439
version_file: flutter_master.version
445-
# set up for 34
446440
package_sharding: "--shardIndex 2 --shardCount 6"
447441
dependencies: >-
448442
[
@@ -461,7 +455,6 @@ targets:
461455
target_file: android_platform_tests.yaml
462456
channel: master
463457
version_file: flutter_master.version
464-
# set up for 34
465458
package_sharding: "--shardIndex 3 --shardCount 6"
466459
dependencies: >-
467460
[
@@ -480,7 +473,6 @@ targets:
480473
target_file: android_platform_tests.yaml
481474
channel: master
482475
version_file: flutter_master.version
483-
# set up for 34
484476
package_sharding: "--shardIndex 4 --shardCount 6"
485477
dependencies: >-
486478
[
@@ -499,7 +491,6 @@ targets:
499491
target_file: android_platform_tests.yaml
500492
channel: master
501493
version_file: flutter_master.version
502-
# set up for 34
503494
package_sharding: "--shardIndex 5 --shardCount 6"
504495
dependencies: >-
505496
[
@@ -511,44 +502,6 @@ targets:
511502
"PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
512503
}
513504
514-
- name: Linux_android android_platform_tests_api_33_shard_1 master
515-
recipe: packages/packages
516-
timeout: 60
517-
properties:
518-
target_file: android_platform_tests_api_33_avd.yaml
519-
channel: master
520-
version_file: flutter_master.version
521-
# set up for 33
522-
package_sharding: "--shardIndex 0 --shardCount 2"
523-
dependencies: >-
524-
[
525-
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
526-
]
527-
env_variables: >-
528-
{
529-
"CHANNEL": "master",
530-
"PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
531-
}
532-
533-
- name: Linux_android android_platform_tests_api_33_shard_2 master
534-
recipe: packages/packages
535-
timeout: 60
536-
properties:
537-
target_file: android_platform_tests_api_33_avd.yaml
538-
channel: master
539-
version_file: flutter_master.version
540-
# set up for 33
541-
package_sharding: "--shardIndex 1 --shardCount 2"
542-
dependencies: >-
543-
[
544-
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
545-
]
546-
env_variables: >-
547-
{
548-
"CHANNEL": "master",
549-
"PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
550-
}
551-
552505
- name: Linux_android android_platform_tests_shard_1 stable
553506
recipe: packages/packages
554507
presubmit: false
@@ -663,42 +616,6 @@ targets:
663616
"PACKAGE_SHARDING": "--shardIndex 5 --shardCount 6"
664617
}
665618
666-
- name: Linux_android android_platform_tests_api_33_shard_1 stable
667-
recipe: packages/packages
668-
timeout: 60
669-
properties:
670-
target_file: android_platform_tests_api_33_avd.yaml
671-
channel: stable
672-
version_file: flutter_stable.version
673-
package_sharding: "--shardIndex 0 --shardCount 2"
674-
dependencies: >-
675-
[
676-
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
677-
]
678-
env_variables: >-
679-
{
680-
"CHANNEL": "stable",
681-
"PACKAGE_SHARDING": "--shardIndex 0 --shardCount 2"
682-
}
683-
684-
- name: Linux_android android_platform_tests_api_33_shard_2 stable
685-
recipe: packages/packages
686-
timeout: 60
687-
properties:
688-
target_file: android_platform_tests_api_33_avd.yaml
689-
channel: stable
690-
version_file: flutter_stable.version
691-
package_sharding: "--shardIndex 1 --shardCount 2"
692-
dependencies: >-
693-
[
694-
{"dependency": "android_virtual_device", "version": "android_33_google_apis_x64.textpb"}
695-
]
696-
env_variables: >-
697-
{
698-
"CHANNEL": "stable",
699-
"PACKAGE_SHARDING": "--shardIndex 1 --shardCount 2"
700-
}
701-
702619
- name: Linux_android_legacy android_platform_tests_legacy_api_shard_1 master
703620
recipe: packages/packages
704621
timeout: 60

.ci/targets/android_platform_tests.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ tasks:
55
- name: download Dart and Android deps
66
script: .ci/scripts/tool_runner.sh
77
infra_step: true
8-
args: ["fetch-deps", "--android", "--supporting-target-platforms-only", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
8+
args: ["fetch-deps", "--android", "--supporting-target-platforms-only"]
99
- name: build examples
1010
script: .ci/scripts/tool_runner.sh
11-
args: ["build-examples", "--apk", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
11+
args: ["build-examples", "--apk"]
1212
- name: lint
1313
script: .ci/scripts/tool_runner.sh
14-
args: ["lint-android", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
14+
args: ["lint-android"]
1515
# Native unit and native integration are split into two steps to allow for
1616
# different exclusions.
1717
# TODO(stuartmorgan): Eliminate the native unit test exclusion, and combine
1818
# these steps.
1919
- name: native unit tests
2020
script: .ci/scripts/tool_runner.sh
21-
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml,script/configs/still_requires_api_33_avd.yaml"]
21+
args: ["native-test", "--android", "--no-integration", "--exclude=script/configs/exclude_native_unit_android.yaml"]
2222
- name: native integration tests
2323
script: .ci/scripts/tool_runner.sh
24-
args: ["native-test", "--android", "--no-unit", "--exclude=script/configs/still_requires_api_33_avd.yaml"]
24+
args: ["native-test", "--android", "--no-unit"]
2525
- name: drive examples
2626
script: .ci/scripts/tool_runner.sh
27-
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml,script/configs/still_requires_api_33_avd.yaml"]
27+
args: ["drive-examples", "--android", "--exclude=script/configs/exclude_integration_android.yaml,script/configs/exclude_integration_android_emulator.yaml"]

.ci/targets/android_platform_tests_api_33_avd.yaml

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

0 commit comments

Comments
 (0)