From 2f6fdf2650d4ce039efe17aea2b3fe9824cc0729 Mon Sep 17 00:00:00 2001 From: Matan Lurey Date: Thu, 25 Jan 2024 17:07:08 -0800 Subject: [PATCH] Start renaming by adding a new `bringup: true` as an Android emulator. (#142257) Part 2 of https://github.com/flutter/flutter/issues/142178. Supersedes https://github.com/flutter/flutter/pull/142078. Feedback welcome to avoid reverts! --- .ci.yaml | 31 +++++++++++++++++-- TESTOWNERS | 4 +-- ...> external_textures_integration_test.dart} | 2 +- ...ternal_textures_integration_test_ios.dart} | 2 +- .../lib/tasks/integration_tests.dart | 2 +- .../external_textures/README.md | 4 +-- .../external_textures/ios/Runner/Info.plist | 2 +- 7 files changed, 37 insertions(+), 10 deletions(-) rename dev/devicelab/bin/tasks/{external_ui_integration_test.dart => external_textures_integration_test.dart} (87%) rename dev/devicelab/bin/tasks/{external_ui_integration_test_ios.dart => external_textures_integration_test_ios.dart} (87%) diff --git a/.ci.yaml b/.ci.yaml index b18e91ee9ed0a..325da96e245fb 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2167,6 +2167,9 @@ targets: ["devicelab", "android", "linux", "pixel", "7pro"] task_name: embedded_android_views_integration_test + # TODO(https://github.com/flutter/flutter/issues/142178): Remove this. + # In the process of (a) renaming this "external_textures" and (b) making it + # an emulator test instead of a physical device. - name: Linux_pixel_7pro external_ui_integration_test recipe: devicelab/devicelab_drone presubmit: false @@ -2174,7 +2177,24 @@ targets: properties: tags: > ["devicelab", "android", "linux", "pixel", "7pro"] - task_name: external_ui_integration_test + task_name: external_textures_integration_test + + - name: Linux_android_emu external_ui_integration_test + recipe: devicelab/devicelab_drone + # TODO(https://github.com/flutter/flutter/issues/142178): Enable this. + bringup: true + timeout: 60 + # Functionally the same as "presubmit: false", except that we will run on + # presubmit during engine rolls. This test is the *only* automated e2e + # test for external textures for the engine, it should never break. + runIf: + - bin/internal/engine.version + - .ci.yaml + properties: + tags: > + ["devicelab", "linux"] + # TODO(https://github.com/flutter/flutter/issues/142178): Rename this. + task_name: external_textures_integration_test # linux motog4 benchmark - name: Linux_android fading_child_animation_perf__timeline_summary @@ -4274,6 +4294,13 @@ targets: ["devicelab", "ios", "mac"] task_name: imagefiltered_transform_animation_perf_ios__timeline_summary + # TODO(https://github.com/flutter/flutter/issues/106806): Find a way to + # re-enable this without "ignore_flakiness: "true"", likely by loostening the + # test assertions, or potentially not running the frame rate tests at all on + # iOS (for example, doing pixel-tests instead). + # + # Also, rename this to "external_textures_integration_test" to be consistent + # with the Android test, but that can wait until we've figured out the flake. - name: Mac_ios external_ui_integration_test_ios recipe: devicelab/devicelab_drone presubmit: false @@ -4281,7 +4308,7 @@ targets: properties: tags: > ["devicelab", "ios", "mac"] - task_name: external_ui_integration_test_ios + task_name: external_textures_integration_test_ios ignore_flakiness: "true" - name: Mac_ios route_test_ios diff --git a/TESTOWNERS b/TESTOWNERS index af68657116dea..8f918a4a3b5ae 100644 --- a/TESTOWNERS +++ b/TESTOWNERS @@ -129,7 +129,7 @@ /dev/devicelab/bin/tasks/cull_opacity_perf__timeline_summary.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/drive_perf_debug_warning.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/embedded_android_views_integration_test.dart @stuartmorgan @flutter/plugin -/dev/devicelab/bin/tasks/external_ui_integration_test.dart @zanderso @flutter/engine +/dev/devicelab/bin/tasks/external_textures_integration_test.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/fading_child_animation_perf__timeline_summary.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/fast_scroll_large_images__memory.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/flavors_test.dart @zanderso @flutter/tool @@ -174,7 +174,7 @@ /dev/devicelab/bin/tasks/complex_layout_scroll_perf_bad_ios__timeline_summary.dart @jonahwilliams @flutter/engine /dev/devicelab/bin/tasks/complex_layout_scroll_perf_ios__timeline_summary.dart @vashworth @flutter/engine /dev/devicelab/bin/tasks/cubic_bezier_perf_ios_sksl_warmup__timeline_summary.dart @zanderso @flutter/engine -/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart @zanderso @flutter/engine +/dev/devicelab/bin/tasks/external_textures_integration_test_ios.dart @zanderso @flutter/engine /dev/devicelab/bin/tasks/flavors_test_ios.dart @vashworth @flutter/tool /dev/devicelab/bin/tasks/flavors_test_ios_xcode_debug.dart @vashworth @flutter/tool /dev/devicelab/bin/tasks/flutter_gallery__transition_perf_e2e_ios.dart @zanderso @flutter/engine diff --git a/dev/devicelab/bin/tasks/external_ui_integration_test.dart b/dev/devicelab/bin/tasks/external_textures_integration_test.dart similarity index 87% rename from dev/devicelab/bin/tasks/external_ui_integration_test.dart rename to dev/devicelab/bin/tasks/external_textures_integration_test.dart index 4ee4488f92def..28d234baec54c 100644 --- a/dev/devicelab/bin/tasks/external_ui_integration_test.dart +++ b/dev/devicelab/bin/tasks/external_textures_integration_test.dart @@ -8,5 +8,5 @@ import 'package:flutter_devicelab/tasks/integration_tests.dart'; Future main() async { deviceOperatingSystem = DeviceOperatingSystem.android; - await task(createExternalUiFrameRateIntegrationTest()); + await task(createExternalTexturesFrameRateIntegrationTest()); } diff --git a/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart b/dev/devicelab/bin/tasks/external_textures_integration_test_ios.dart similarity index 87% rename from dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart rename to dev/devicelab/bin/tasks/external_textures_integration_test_ios.dart index 3db0dc29666af..e389df10c7e0f 100644 --- a/dev/devicelab/bin/tasks/external_ui_integration_test_ios.dart +++ b/dev/devicelab/bin/tasks/external_textures_integration_test_ios.dart @@ -8,5 +8,5 @@ import 'package:flutter_devicelab/tasks/integration_tests.dart'; Future main() async { deviceOperatingSystem = DeviceOperatingSystem.ios; - await task(createExternalUiFrameRateIntegrationTest()); + await task(createExternalTexturesFrameRateIntegrationTest()); } diff --git a/dev/devicelab/lib/tasks/integration_tests.dart b/dev/devicelab/lib/tasks/integration_tests.dart index 70177e1645133..17f5d3d9df476 100644 --- a/dev/devicelab/lib/tasks/integration_tests.dart +++ b/dev/devicelab/lib/tasks/integration_tests.dart @@ -40,7 +40,7 @@ TaskFunction createIntegrationTestFlavorsTest({Map? environment} ).call; } -TaskFunction createExternalUiFrameRateIntegrationTest() { +TaskFunction createExternalTexturesFrameRateIntegrationTest() { return DriverTest( '${flutterDirectory.path}/dev/integration_tests/external_textures', 'lib/frame_rate_main.dart', diff --git a/dev/integration_tests/external_textures/README.md b/dev/integration_tests/external_textures/README.md index 84e9bc5b20372..b4fd5f3540a1d 100644 --- a/dev/integration_tests/external_textures/README.md +++ b/dev/integration_tests/external_textures/README.md @@ -40,8 +40,8 @@ flutter drive lib/frame_rate_main.dart --driver test_driver/frame_rate_test.dart > > The actual tests are run by task runners: > -> - [Android](../../devicelab/bin/tasks/external_ui_integration_test.dart) -> - [iOS](../../devicelab/bin/tasks/external_ui_integration_test_ios.dart) +> - [Android](../../devicelab/bin/tasks/external_textures_integration_test.dart) +> - [iOS](../../devicelab/bin/tasks/external_textures_integration_test_ios.dart) [^1]: Only iOS and Android. [^2]: Unfortunately documentation is quite limited. See [#142021](https://github.com/flutter/flutter/issues/142021). diff --git a/dev/integration_tests/external_textures/ios/Runner/Info.plist b/dev/integration_tests/external_textures/ios/Runner/Info.plist index 60d8199829bb2..4a2790fb5c0fa 100644 --- a/dev/integration_tests/external_textures/ios/Runner/Info.plist +++ b/dev/integration_tests/external_textures/ios/Runner/Info.plist @@ -11,7 +11,7 @@ CFBundleInfoDictionaryVersion 6.0 CFBundleName - external_ui + external_textures CFBundlePackageType APPL CFBundleShortVersionString