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

Fix abi key for local golden file testing #148072

Merged
merged 4 commits into from May 14, 2024
Merged

Conversation

Piinks
Copy link
Contributor

@Piinks Piinks commented May 9, 2024

Fixes #148022

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@Piinks Piinks added a: tests "flutter test", flutter_test, or one of our tests team Infra upgrades, team productivity, code health, technical debt. See also team: labels. framework flutter/packages/flutter repository. See also f: labels. labels May 9, 2024
@Piinks Piinks requested a review from goderbauer May 9, 2024 17:38
Copy link
Member

@goderbauer goderbauer left a comment

Choose a reason for hiding this comment

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

LGTM

Thank you for digging into this!

@@ -582,19 +582,22 @@ class SkiaGoldClient {
/// the image keys.
String getTraceID(String testName) {
final String? webRenderer = _webRendererValue;
// Keys must be sorted alphabetically, after grouping by letter case.
Copy link
Member

Choose a reason for hiding this comment

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

Is this also relevant for _getKeysJSON?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is not, since those keys are sorted by Gold when they are ingested. It matters here because we are using the keys to generate an md5 sum to look up the image, and being out of order means we get the wrong result.

Copy link
Contributor

Choose a reason for hiding this comment

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

"alphabetically, after grouping by letter case" is just "sort by Unicode scalar value" which is just the default string sort in Dart, so one way to do this would be to create the map first, then get the keys, sort them, and add the key/value pairs to a new map in the sorted order. That would avoid future bugs when someone adds a new key manually and gets the order wrong. It would cost a few CPU cycles and some memory though.

Copy link
Contributor

Choose a reason for hiding this comment

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

ah, just saw the comment below. Yeah, the order here is just the default order for Dart sorting.

void main() {
  Map<String, int> test = {'a': 3, 'B': 2, 'A': 1, 'b': 4};
  print(test);
  print(test.keys.toList()..sort());
  Map<String, int> sorted = {};
  for (String key in test.keys.toList()..sort()) {
    sorted[key] = test[key]!;
  }
  print(sorted);
}

->

{a: 3, B: 2, A: 1, b: 4}
[A, B, a, b]
{A: 1, B: 2, a: 3, b: 4}

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This week I learned Dart does that by default! Awesome! Yeah I'll update this to sort keys so we don't have to worry about it recurring. :)

if (_isImpeller)
'impeller': 'swiftshader',
'name' : testName,
'source_type' : 'flutter',
};
final String jsonTrace = json.encode(keys);
Copy link
Member

Choose a reason for hiding this comment

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

Could we add an assert here (or a test elsewhere) that enforces the sorting rules and breaks if this is messed up in the future?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I can, it would be pretty complicated though (and probably not today) to account for all the cases where we do or don't include a given key. We don't add keys very often, I was kind of hoping the comment would suffice. WDYT?

Copy link

Choose a reason for hiding this comment

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

It does seem a touch fragile. Would it be worth adding some code that somehow alphabetizes the map keys first? If so, then I would imagine it would be easier to add a few tests for that logic: input(map) output(md5 hash).

Copy link
Member

@goderbauer goderbauer May 9, 2024

Choose a reason for hiding this comment

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

Isn't this just:

  assert(() {
    List sorted = keys.keys.toList()..sort();
    return listEquals(sorted, keys.keys.toList());
  }());

Although, maybe doing this on every golden check is kinda slowing things down? I'd be okay with leaving this out as well.

Edit: Thinking about this some more, I do think we should guard against this error a little stronger than just a comment...

This comment was marked as spam.

This comment was marked as spam.

Copy link
Member

@goderbauer goderbauer May 9, 2024

Choose a reason for hiding this comment

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

Another option would be to just throw these key-values into a self-ordering data structure, e.g. https://main-api.flutter.dev/flutter/dart-collection/SplayTreeMap-class.html

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh! Will dart sort by case before alphabetical order? I didn't think it would.. let me check

Copy link
Member

@goderbauer goderbauer left a comment

Choose a reason for hiding this comment

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

LGTM

@Piinks Piinks added the autosubmit Merge PR when tree becomes green via auto submit App label May 14, 2024
@auto-submit auto-submit bot merged commit 4a1e3ea into flutter:master May 14, 2024
71 checks passed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request May 15, 2024
auto-submit bot pushed a commit to flutter/packages that referenced this pull request May 15, 2024
flutter/flutter@d2da1b2...39651e8

2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from d35a1a603c80 to bf1c6da0dd31 (1 revision) (flutter/flutter#148369)
2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from 55c62ff82c7e to d35a1a603c80 (4 revisions) (flutter/flutter#148367)
2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from a1d930a3a84d to 55c62ff82c7e (3 revisions) (flutter/flutter#148365)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from dfb5871260a6 to a1d930a3a84d (2 revisions) (flutter/flutter#148360)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 1b508a071c96 to dfb5871260a6 (1 revision) (flutter/flutter#148356)
2024-05-14 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.3.1 to 4.4.0 (flutter/flutter#148355)
2024-05-14 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in `SnackBar` (flutter/flutter#147212)
2024-05-14 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in open upwards page transition (flutter/flutter#148046)
2024-05-14 47866232+chunhtai@users.noreply.github.com Fixes semantics ordering when there are multiple TextFields with pref� (flutter/flutter#148267)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from ae9ff69a0840 to 1b508a071c96 (2 revisions) (flutter/flutter#148351)
2024-05-14 bruno.leroux@gmail.com Add missing InputDecorator.hintText tests (flutter/flutter#148113)
2024-05-14 katelovett@google.com Fix abi key for local golden file testing (flutter/flutter#148072)
2024-05-14 ybz975218925@gmail.com Maintain the same layout constraints for item in the ReorderableList during dragging as before dragging. (flutter/flutter#147863)
2024-05-14 82763757+NobodyForNothing@users.noreply.github.com test material text field example (flutter/flutter#147864)
2024-05-14 victorsanniay@gmail.com Move toggleable to widget layer (flutter/flutter#148272)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 08b44d906fab to ae9ff69a0840 (1 revision) (flutter/flutter#148341)
2024-05-14 andrewrkolos@gmail.com add another print trace to runInView (flutter/flutter#148337)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7bf865774d06 to 08b44d906fab (4 revisions) (flutter/flutter#148338)

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 rmistry@google.com,stuartmorgan@google.com 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
TecHaxter pushed a commit to TecHaxter/flutter_packages that referenced this pull request May 22, 2024
…r#6738)

flutter/flutter@d2da1b2...39651e8

2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from d35a1a603c80 to bf1c6da0dd31 (1 revision) (flutter/flutter#148369)
2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from 55c62ff82c7e to d35a1a603c80 (4 revisions) (flutter/flutter#148367)
2024-05-15 engine-flutter-autoroll@skia.org Roll Flutter Engine from a1d930a3a84d to 55c62ff82c7e (3 revisions) (flutter/flutter#148365)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from dfb5871260a6 to a1d930a3a84d (2 revisions) (flutter/flutter#148360)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 1b508a071c96 to dfb5871260a6 (1 revision) (flutter/flutter#148356)
2024-05-14 49699333+dependabot[bot]@users.noreply.github.com Bump codecov/codecov-action from 4.3.1 to 4.4.0 (flutter/flutter#148355)
2024-05-14 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in `SnackBar` (flutter/flutter#147212)
2024-05-14 32538273+ValentinVignal@users.noreply.github.com Fix memory leaks in open upwards page transition (flutter/flutter#148046)
2024-05-14 47866232+chunhtai@users.noreply.github.com Fixes semantics ordering when there are multiple TextFields with pref� (flutter/flutter#148267)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from ae9ff69a0840 to 1b508a071c96 (2 revisions) (flutter/flutter#148351)
2024-05-14 bruno.leroux@gmail.com Add missing InputDecorator.hintText tests (flutter/flutter#148113)
2024-05-14 katelovett@google.com Fix abi key for local golden file testing (flutter/flutter#148072)
2024-05-14 ybz975218925@gmail.com Maintain the same layout constraints for item in the ReorderableList during dragging as before dragging. (flutter/flutter#147863)
2024-05-14 82763757+NobodyForNothing@users.noreply.github.com test material text field example (flutter/flutter#147864)
2024-05-14 victorsanniay@gmail.com Move toggleable to widget layer (flutter/flutter#148272)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 08b44d906fab to ae9ff69a0840 (1 revision) (flutter/flutter#148341)
2024-05-14 andrewrkolos@gmail.com add another print trace to runInView (flutter/flutter#148337)
2024-05-14 engine-flutter-autoroll@skia.org Roll Flutter Engine from 7bf865774d06 to 08b44d906fab (4 revisions) (flutter/flutter#148338)

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 rmistry@google.com,stuartmorgan@google.com 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
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
a: tests "flutter test", flutter_test, or one of our tests autosubmit Merge PR when tree becomes green via auto submit App framework flutter/packages/flutter repository. See also f: labels. team Infra upgrades, team productivity, code health, technical debt. See also team: labels.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Local golden file testing is not using abi key
5 participants