firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix abi key for local golden file testing (#148072)

Browse Source 
Fixes https://github.com/flutter/flutter/issues/148022
This commit is contained in:
Kate Lovett 2024-05-14 15:58:18 -05:00 committed by GitHub
parent e2ef38d19f
commit 4a1e3eaaa2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
packages/flutter_goldens/lib/skia_client.dart
View File

@ -580,21 +580,24 @@ class SkiaGoldClient {
/// the image keys. /// the image keys.
String getTraceID(String testName) { String getTraceID(String testName) {
final String? webRenderer = _webRendererValue; final String? webRenderer = _webRendererValue;
final Map<String, Object?> keys = <String, Object?>{ final Map<String, Object?> parameters = <String, Object?>{
if (_isBrowserTest) if (_isBrowserTest)
'Browser' : _browserKey, 'Browser' : _browserKey,
if (webRenderer != null) 'Abi': abi.toString(),
'WebRenderer' : webRenderer,
'CI' : 'luci', 'CI' : 'luci',
'Platform' : platform.operatingSystem, 'Platform' : platform.operatingSystem,
// 'Abi': abi.toString(), workaround for https://g-issues.skia.org/issues/339508268 if (webRenderer != null)
// Flutter tracking issue: https://github.com/flutter/flutter/issues/148022 'WebRenderer' : webRenderer,
'name' : testName,
'source_type' : 'flutter',
if (_isImpeller) if (_isImpeller)
'impeller': 'swiftshader', 'impeller': 'swiftshader',
'name' : testName,
'source_type' : 'flutter',
}; };
final String jsonTrace = json.encode(keys); final Map<String, Object?> sorted = <String, Object?>{};
for (final String key in parameters.keys.toList()..sort()) {
sorted[key] = parameters[key];
}
final String jsonTrace = json.encode(sorted);
final String md5Sum = md5.convert(utf8.encode(jsonTrace)).toString(); final String md5Sum = md5.convert(utf8.encode(jsonTrace)).toString();
return md5Sum; return md5Sum;
} }

6
packages/flutter_goldens/test/flutter_goldens_test.dart
View File

@ -499,7 +499,7 @@ void main() {
expect( expect(
skiaClient.getTraceID('flutter.golden.1'), skiaClient.getTraceID('flutter.golden.1'),
equals('ae18c7a6aa48e0685525dfe8fdf79003'), equals('d8867d66b8f0be8d0c31598d8370f5dd'),
); );
}); });
@ -533,7 +533,7 @@ void main() {
expect( expect(
skiaClient.getTraceID('flutter.golden.1'), skiaClient.getTraceID('flutter.golden.1'),
equals('e9d5c296c48e7126808520e9cc191243'), equals('febd0e8ef6512c2a82c964b2a9e60012'),
); );
}); });
@ -561,7 +561,7 @@ void main() {
); );
expect( expect(
skiaClient.getTraceID('flutter.golden.1'), skiaClient.getTraceID('flutter.golden.1'),
equals('9968695b9ae78cdb77cbb2be621ca2d6'), equals('2e3d3f41cb4470748fa1c941f7762823'),
); );
}); });