[go: nahoru, domu]
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.

Sign up for GitHub

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

Jump to bottom

Add workaround for bug adding unicode strings to test reports. #145607

Merged
merged 4 commits into from
Mar 23, 2024
Merged

Add workaround for bug adding unicode strings to test reports. #145607

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1c0510f
Add workaround for bug adding unicode strings to test reports.
godofredoc Mar 22, 2024
33cdeea
Remove unused import.
godofredoc Mar 22, 2024
a98aae5
Add todo to remove workaround.
godofredoc Mar 22, 2024
c4d431e
Change + to *.
godofredoc Mar 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add workaround for bug adding unicode strings to test reports. 
When print is used inside tests its content is added to the test report
as a string of unicode \u0000 making the test reporting parser fail.
This PR cleans removes non json content every line of the report.

Bug: #145553
  • Loading branch information
@godofredoc
godofredoc committed Mar 22, 2024
commit 1c0510f9f63a81c443c520ddc39c28521fd77a5f
9 changes: 8 additions & 1 deletion dev/bots/tool_subsharding.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
// found in the LICENSE file.

import 'dart:convert';
import 'dart:developer';
import 'dart:io';

class TestSpecs {
Expand Down Expand Up @@ -49,7 +50,13 @@ class TestFileReporterResults {
final List<String> errors = <String>[];

for (final String metric in metrics.readAsLinesSync()) {
final Map<String, Object?> entry = json.decode(metric) as Map<String, Object?>;
/// Using print within a test adds the printed content to the json file report
/// as \u0000 making the file parsing step fail. The content of the json file
/// is expected to be a json dictionary per line and the following line removes
/// all the additional content at the beginning of the line until it finds the
/// first opening curly bracket.
final String sanitizedMetric = metric.replaceAll(RegExp(r'$.+{'), '{');
Copy link
Member

Choose a reason for hiding this comment

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

I think this pattern should start with ^ for start of line, whereas $ is end of line

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The stdout from print is added to the beginning of the line followed by the real event dict. e.g @^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@^@ ^@^@{"testID":11,"result":"success","skipped":false,"hidden":false,"type":"testDone","time":22248}

Copy link
Member

Choose a reason for hiding this comment

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

right but ^.*{ should catch that (changed a + to *, since we're not guaranteed to have a newline)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated!

final Map<String, Object?> entry = json.decode(sanitizedMetric) as Map<String, Object?>;
if (entry.containsKey('suite')) {
final Map<String, Object?> suite = entry['suite']! as Map<String, Object?>;
addTestSpec(suite, entry['time']! as int, testSpecs);
Expand Down