Skip to content

Reverts "[data_assets] Cleanup tests (#184209)"#184575

Merged
eyebrowsoffire merged 1 commit into
masterfrom
revert_e13b5e61974f8878f704b62ca0d4093a0baac377
Apr 3, 2026
Merged

Reverts "[data_assets] Cleanup tests (#184209)"#184575
eyebrowsoffire merged 1 commit into
masterfrom
revert_e13b5e61974f8878f704b62ca0d4093a0baac377

Conversation

@auto-submit

@auto-submit auto-submit Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor

Reverts: #184209

Initiated by: hellohuanlin

Reason for reverting:

Breaks Mac_x64 build_tests_2_4. See https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_x64%20build_tests_2_4/11979/overview. Test running time regressed from 15-16 minutes ish to 36 minutes. The tree is toggling between red & green, so i guess our timeout is likely close to 35 minutes or so?

Original PR Author: dcharkes

Reviewed By: {goderbauer}

This change reverts the following previous change:
This cleans up the data_assets experiment testing.

  • Use integration test projects, which are statically analyzed, formatted, etc.
  • This forces us to be explicit about the package:data_assets dependency.
  • This means the test projects will roll their dependencies with the dependency auto roller. (The test project was still using native_assets_cli which has been replaced with hooks and data_assets.)
  • Pin package:data_assets, because it's experimental, and we might do breaking changes.

Also makes the test projects more useful:

  • The data_assets_app now displays the assets in the UI. (Not only prints to the console for the integration tests.)
  • The data_assets_package now actually uses its asset.

And cleans up the test projects:

  • Move the test files into the data/ dir.
  • Give the test data assets a proper extension.

I saw weird behavior on Windows:

  • DevFS doesn't pick up the writes to the Dart files, not even with flushing or sleeps: Compiling dart to kernel with 0 updated files leading to a state where the Dart variable contents don't get updated while the data assets do. This integration test is not really about Dart hot restart, so I've skipped those checks on Windows.
  • This reproduces locally in the integration test, but not when running the app and editing the file.

The checks in dev/bots/analyze.dart also required some updates:

  • The template files check didn't allow for the HTML license.

P.S. Sorry for all the generated Flutter scaffolding. It seems that that is the way it's done in the integration test directory. (The package with the data assets is clean, but the Flutter app ...)

@auto-submit auto-submit Bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 3, 2026
@auto-submit auto-submit Bot added the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 3, 2026
@github-actions github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop labels Apr 3, 2026
@auto-submit auto-submit Bot removed the revert of Bot Only: Tracking label for bot. Tracks new revert of pull requests. label Apr 3, 2026
@auto-submit

auto-submit Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor Author

auto label is removed for flutter/flutter/184575, Failed to enqueue flutter/flutter/184575 with HTTP 400: GraphQL mutate failed.

@hellohuanlin hellohuanlin requested a review from dcharkes April 3, 2026 14:31
@hellohuanlin hellohuanlin added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@auto-submit

auto-submit Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor Author

auto label is removed for flutter/flutter/184575, Failed to enqueue flutter/flutter/184575 with HTTP 400: GraphQL mutate failed.

@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@hellohuanlin hellohuanlin added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@auto-submit

auto-submit Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor Author

auto label is removed for flutter/flutter/184575, Failed to enqueue flutter/flutter/184575 with HTTP 400: GraphQL mutate failed.

@hellohuanlin hellohuanlin added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@auto-submit auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Apr 3, 2026
@auto-submit

auto-submit Bot commented Apr 3, 2026

Copy link
Copy Markdown
Contributor Author

auto label is removed for flutter/flutter/184575, Failed to enqueue flutter/flutter/184575 with HTTP 400: GraphQL mutate failed.

@eyebrowsoffire eyebrowsoffire enabled auto-merge April 3, 2026 16:52
@eyebrowsoffire eyebrowsoffire added emergency Jump the queue; land PR in front of all others; only use for emergencies CICD Run CI/CD labels Apr 3, 2026
@flutter-dashboard

Copy link
Copy Markdown

Detected the emergency label.

If you add the autosubmit label, the bot will wait until all presubmits pass but ignore the tree status, allowing fixes for tree breakages while still validating that they don't break any existing presubmits.

The "Merge" button is also unlocked. To bypass presubmits as well as the tree status, press the GitHub "Add to Merge Queue".

@eyebrowsoffire eyebrowsoffire added this pull request to the merge queue Apr 3, 2026
Merged via the queue into master with commit b49f9e9 Apr 3, 2026
169 checks passed
@eyebrowsoffire eyebrowsoffire deleted the revert_e13b5e61974f8878f704b62ca0d4093a0baac377 branch April 3, 2026 17:37
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 4, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 4, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 5, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2026
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Apr 6, 2026
auto-submit Bot pushed a commit to flutter/packages that referenced this pull request Apr 6, 2026
flutter/flutter@7245c3f...9cd60b5

2026-04-06 [email protected] Fix go/ links in rbe.mde (flutter/flutter#184672)
2026-04-06 [email protected] Roll Packages from d31df66 to 5299279 (2 revisions) (flutter/flutter#184663)
2026-04-06 [email protected] Add suggestion for what types of skills are helpful (flutter/flutter#184661)
2026-04-06 [email protected] Roll Fuchsia Linux SDK from hrLZV-ij47FXnv_m5... to 1rcChbOv4nSTVkUxs... (flutter/flutter#184657)
2026-04-06 [email protected] Skill to find dart or flutter revision from a hash (flutter/flutter#184589)
2026-04-06 [email protected] Roll Skia from 207c6721c64b to 163dfdf500c7 (7 revisions) (flutter/flutter#184650)
2026-04-05 [email protected] Roll Skia from 52b79372764c to 207c6721c64b (1 revision) (flutter/flutter#184636)
2026-04-05 [email protected] Roll Fuchsia Linux SDK from D2z-jMnRVbcwcraY-... to hrLZV-ij47FXnv_m5... (flutter/flutter#184623)
2026-04-05 [email protected] Roll Skia from 500bc1651c86 to 52b79372764c (1 revision) (flutter/flutter#184621)
2026-04-04 [email protected] Roll Fuchsia Linux SDK from PpL3Bn2YMb2h9LbdK... to D2z-jMnRVbcwcraY-... (flutter/flutter#184611)
2026-04-04 [email protected] Roll Dart SDK from 102a3d1c7fe5 to 79f728f5d66e (1 revision) (flutter/flutter#184610)
2026-04-04 [email protected] Roll Skia from 5e5a7f252b5e to 500bc1651c86 (1 revision) (flutter/flutter#184609)
2026-04-04 [email protected] Roll Skia from ec209c206aa5 to 5e5a7f252b5e (2 revisions) (flutter/flutter#184606)
2026-04-04 [email protected] Roll Dart SDK from f7be88117622 to 102a3d1c7fe5 (2 revisions) (flutter/flutter#184604)
2026-04-04 [email protected] refactor: remove material from color and image filter test (flutter/flutter#183563)
2026-04-04 [email protected] Roll Skia from 50f3a9aaa185 to ec209c206aa5 (1 revision) (flutter/flutter#184601)
2026-04-03 [email protected] Roll Skia from 4ecb7b28459f to 50f3a9aaa185 (3 revisions) (flutter/flutter#184599)
2026-04-03 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Roll ICU from ee5f27adc28b to ff7995a708a1 (5 revisions) (#184566)" (flutter/flutter#184586)
2026-04-03 [email protected] Add integration scripts and tools for SwiftPM add to app (flutter/flutter#184204)
2026-04-03 [email protected] Roll Dart SDK from 46f49142acd9 to f7be88117622 (1 revision) (flutter/flutter#184596)
2026-04-03 [email protected] [AGP 9] Add Disable Built-in Kotlin and newDSL Migratorrs (flutter/flutter#184255)
2026-04-03 [email protected] Roll Skia from 3b0f0f04f97c to 4ecb7b28459f (7 revisions) (flutter/flutter#184594)
2026-04-03 [email protected] refactor: remove material from list_view_viewporting_test and page_forward_transitions_test (flutter/flutter#183564)
2026-04-03 [email protected] [Dot shorthands] Migrate examples/api/lib/cupertino (flutter/flutter#183964)
2026-04-03 [email protected] Downgrade CocoaPods doctor check to warning and fix build error messaging (flutter/flutter#184511)
2026-04-03 [email protected] Roll Skia from 4134f8091147 to 3b0f0f04f97c (2 revisions) (flutter/flutter#184582)
2026-04-03 [email protected] Remove live_text_utils cross-imports from material and cupertino tests (flutter/flutter#184517)
2026-04-03 98614782+auto-submit[bot]@users.noreply.github.com Reverts "[data_assets] Cleanup tests (#184209)" (flutter/flutter#184575)
2026-04-03 [email protected] Roll Packages from 66bf7ec to d31df66 (3 revisions) (flutter/flutter#184578)
2026-04-03 [email protected] Roll Skia from 5d847ba5c4aa to 4134f8091147 (1 revision) (flutter/flutter#184573)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC [email protected],[email protected] on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@reidbaker reidbaker mentioned this pull request Apr 8, 2026
4 tasks
mbcorona pushed a commit to mbcorona/flutter that referenced this pull request Apr 15, 2026
<!-- start_original_pr_link -->
Reverts: flutter#184209
<!-- end_original_pr_link -->
<!-- start_initiating_author -->
Initiated by: hellohuanlin
<!-- end_initiating_author -->
<!-- start_revert_reason -->
Reason for reverting: 

Breaks `Mac_x64 build_tests_2_4`. See
https://ci.chromium.org/ui/p/flutter/builders/prod/Mac_x64%20build_tests_2_4/11979/overview.
Test running time regressed from 15-16 minutes ish to 36 minutes. The
tree is toggling between red & green, so i guess our timeout is likely
close to 35 minutes or so?

<!-- end_revert_reason -->
<!-- start_original_pr_author -->
Original PR Author: dcharkes
<!-- end_original_pr_author -->

<!-- start_reviewers -->
Reviewed By: {goderbauer}
<!-- end_reviewers -->

<!-- start_revert_body -->
This change reverts the following previous change:
This cleans up the data_assets experiment testing.

* Use integration test projects, which are statically analyzed,
formatted, etc.
* This forces us to be explicit about the `package:data_assets`
dependency.
* This means the test projects will roll their dependencies with the
dependency auto roller. (The test project was still using
`native_assets_cli` which has been replaced with `hooks` and
`data_assets`.)
* Pin `package:data_assets`, because it's experimental, and we might do
breaking changes.

Also makes the test projects more useful:

* The `data_assets_app` now displays the assets in the UI. (Not only
prints to the console for the integration tests.)
* The `data_assets_package` now actually uses its asset.

And cleans up the test projects:

* Move the test files into the `data/` dir.
* Give the test data assets a proper extension.

I saw weird behavior on Windows:

* DevFS doesn't pick up the writes to the Dart files, not even with
flushing or sleeps: `Compiling dart to kernel with 0 updated files`
leading to a state where the Dart variable contents don't get updated
while the data assets do. This integration test is not really about Dart
hot restart, so I've skipped those checks on Windows.
* This reproduces locally in the integration test, but not when running
the app and editing the file.

The checks in dev/bots/analyze.dart also required some updates:

* The template files check didn't allow for the HTML license.

P.S. Sorry for all the generated Flutter scaffolding. It seems that that
is the way it's done in the integration test directory. (The package
with the data assets is clean, but the Flutter app ...)
<!-- end_revert_body -->

Co-authored-by: auto-submit[bot] <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

a: desktop Running on desktop CICD Run CI/CD emergency Jump the queue; land PR in front of all others; only use for emergencies tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants