Revert "testing: migrate some tests to python3" This reverts commit 99f2ce39334374f2e7b001d81737feb411b0138d. Reason for revert: Speculative revert NativeMessaging tests started failing on mac and there is no obvious culprit in the blamelist. https://ci.chromium.org/ui/p/chromium/builders/ci/mac11-arm64-rel-tests/3724 Original change's description: > testing: migrate some tests to python3 > > To suppress UnicodeDecodeError, add an wrapper class for stdin in > asan_symbolize.py. > > Fixed: 1288169 > Change-Id: I5d5b8726b148b3bf95887803911bd47c696a3da2 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3423288 > Reviewed-by: Joe Downing <joedow@chromium.org> > Reviewed-by: Nico Weber <thakis@chromium.org> > Commit-Queue: Takuto Ikuta <tikuta@chromium.org> > Cr-Commit-Position: refs/heads/main@{#966056} Change-Id: Ie47853985626bfa7dc75cc4b9b9f44552593d417 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3431019 Auto-Submit: Christos Froussios <cfroussios@chromium.org> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Reviewed-by: Christos Froussios <cfroussios@chromium.org> Owners-Override: Christos Froussios <cfroussios@chromium.org> Reviewed-by: Christoph Schwering <schwering@google.com> Commit-Queue: Christoph Schwering <schwering@google.com> Cr-Commit-Position: refs/heads/main@{#966146} NOKEYCHECK=True GitOrigin-RevId: 9b8a696a5670d3dd603a981784f20bfb6580ceb2
diff --git a/asan/asan_symbolize.py b/asan/asan_symbolize.py index 1d45322..7f999b8 100755 --- a/asan/asan_symbolize.py +++ b/asan/asan_symbolize.py
@@ -212,29 +212,6 @@ return binary_path -class CheckUTF8: - # This wraps stream and show warnings if stream gets invalid data as utf-8. - def __init__(self, stream): - self._stream = stream - - def __iter__(self): - return self - - def __next__(self): - - l = self._stream.buffer.readline() - - if not l: - raise StopIteration - - try: - return l.decode() - except UnicodeDecodeError: - print("WARNING: asan_symbolize.py failed to decode %s (base64 encoded)" % - base64.b64encode(l).decode()) - return "" - - def main(): parser = argparse.ArgumentParser(description='Symbolize sanitizer reports.') parser.add_argument('--test-summary-json-file', @@ -276,10 +253,7 @@ symbolize_snippets_in_json(args.test_summary_json_file, loop) else: # Process stdin. - if sys.version_info.major > 2: - asan_symbolize.logfile = CheckUTF8(sys.stdin) - else: - asan_symbolize.logfile = sys.stdin + asan_symbolize.logfile = sys.stdin loop.process_logfile()