From 0816053d5dfee2cbcd2710336c20959e665805ca Mon Sep 17 00:00:00 2001 From: Tyson Smith Date: Fri, 17 May 2024 13:53:46 -0700 Subject: [PATCH] Remove check for rr traceback in stderr logs This has been moved to FFPuppet. --- grizzly/common/report.py | 11 ----------- grizzly/common/test_report.py | 18 ------------------ 2 files changed, 29 deletions(-) diff --git a/grizzly/common/report.py b/grizzly/common/report.py index 0d9693ce..19cde52c 100644 --- a/grizzly/common/report.py +++ b/grizzly/common/report.py @@ -3,7 +3,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. from hashlib import sha1 from logging import getLogger -from mmap import ACCESS_READ, mmap from os import SEEK_END from pathlib import Path from platform import machine, system @@ -77,16 +76,6 @@ def __init__( for log in log_path.iterdir(): if log.is_file() and log.stat().st_size > size_limit: Report.tail(log, size_limit) - # check for rr traceback and warn - if self._logs.stderr and (log_path / "rr-traces").is_dir(): - with self._logs.stderr.open("rb") as lfp: - try: - with mmap(lfp.fileno(), 0, access=ACCESS_READ) as lmm: - if lmm.find(b"=== Start rr backtrace:") != -1: - LOG.warning("rr traceback detected in stderr log") - except ValueError: - # cannot mmap an empty file on Windows - pass # look through logs one by one until we find a stack for log_file in (x for x in self._logs if x is not None): stack = Stack.from_text(log_file.read_text("utf-8", errors="ignore")) diff --git a/grizzly/common/test_report.py b/grizzly/common/test_report.py index dba08b2e..a6917113 100644 --- a/grizzly/common/test_report.py +++ b/grizzly/common/test_report.py @@ -412,21 +412,3 @@ def test_report_16(mocker, tmp_path, hang, has_log, expected): assert report.short_signature == expected if hang: assert report.crash_hash == "hang" - - -@mark.parametrize( - "log_data", - [ - # empty stderr log - b"", - # contains rr traceback - b"foo\n=== Start rr backtrace:\nfoo", - # no traceback - b"foo\nfoo", - ], -) -def test_report_17(tmp_path, log_data): - """test Report check for rr traceback""" - (tmp_path / "log_stderr.txt").write_bytes(log_data) - (tmp_path / "rr-traces").mkdir() - assert Report(tmp_path, Path("bin"))