mirrors/ruff
1
0
Fork 0
mirror of https://github.com/astral-sh/ruff.git synced 2025-09-29 13:24:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Improve messages outputted by py-fuzzer (#17764)

Browse source
This commit is contained in:
Alex Waygood 2025-05-01 13:32:45 +01:00 • committed by GitHub
parent 76ec64d535
commit 41f3f21629
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

43
python/py-fuzzer/fuzz.py
View file

@ -120,6 +120,8 @@ class FuzzResult:
maybe_bug: MinimizedSourceCode | None maybe_bug: MinimizedSourceCode | None
# The executable we're testing # The executable we're testing
executable: Executable executable: Executable
_: KW_ONLY
only_new_bugs: bool
def print_description(self, index: int, num_seeds: int) -> None: def print_description(self, index: int, num_seeds: int) -> None:
"""Describe the results of fuzzing the parser with this seed.""" """Describe the results of fuzzing the parser with this seed."""
@ -131,12 +133,16 @@ class FuzzResult:
) )
print(f"{msg:<60} {progress:>15}", flush=True) print(f"{msg:<60} {progress:>15}", flush=True)
new = "new " if self.only_new_bugs else ""
if self.maybe_bug: if self.maybe_bug:
match self.executable: match self.executable:
case Executable.RUFF: case Executable.RUFF:
panic_message = "The following code triggers a parser bug:" panic_message = f"The following code triggers a {new}parser bug:"
case Executable.RED_KNOT: case Executable.RED_KNOT:
panic_message = "The following code triggers a red-knot panic:" panic_message = (
f"The following code triggers a {new}red-knot panic:"
)
case _ as unreachable: case _ as unreachable:
assert_never(unreachable) assert_never(unreachable)
@ -153,6 +159,7 @@ def fuzz_code(seed: Seed, args: ResolvedCliArgs) -> FuzzResult:
minimizer_callback: Callable[[str], bool] | None = None minimizer_callback: Callable[[str], bool] | None = None
if args.baseline_executable_path is None: if args.baseline_executable_path is None:
only_new_bugs = False
if contains_bug( if contains_bug(
code, executable=args.executable, executable_path=args.test_executable_path code, executable=args.executable, executable_path=args.test_executable_path
): ):
@ -162,22 +169,24 @@ def fuzz_code(seed: Seed, args: ResolvedCliArgs) -> FuzzResult:
executable=args.executable, executable=args.executable,
executable_path=args.test_executable_path, executable_path=args.test_executable_path,
) )
elif contains_new_bug( else:
code, only_new_bugs = True
executable=args.executable, if contains_new_bug(
test_executable_path=args.test_executable_path, code,
baseline_executable_path=args.baseline_executable_path,
):
bug_found = True
minimizer_callback = partial(
contains_new_bug,
executable=args.executable, executable=args.executable,
test_executable_path=args.test_executable_path, test_executable_path=args.test_executable_path,
baseline_executable_path=args.baseline_executable_path, baseline_executable_path=args.baseline_executable_path,
) ):
bug_found = True
minimizer_callback = partial(
contains_new_bug,
executable=args.executable,
test_executable_path=args.test_executable_path,
baseline_executable_path=args.baseline_executable_path,
)
if not bug_found: if not bug_found:
return FuzzResult(seed, None, args.executable) return FuzzResult(seed, None, args.executable, only_new_bugs=only_new_bugs)
assert minimizer_callback is not None assert minimizer_callback is not None
@ -194,14 +203,15 @@ def fuzz_code(seed: Seed, args: ResolvedCliArgs) -> FuzzResult:
else: else:
maybe_bug = MinimizedSourceCode(code) maybe_bug = MinimizedSourceCode(code)
return FuzzResult(seed, maybe_bug, args.executable) return FuzzResult(seed, maybe_bug, args.executable, only_new_bugs=only_new_bugs)
def run_fuzzer_concurrently(args: ResolvedCliArgs) -> list[FuzzResult]: def run_fuzzer_concurrently(args: ResolvedCliArgs) -> list[FuzzResult]:
num_seeds = len(args.seeds) num_seeds = len(args.seeds)
print( print(
f"Concurrently running the fuzzer on " f"Concurrently running the fuzzer on "
f"{num_seeds} randomly generated source-code files..." f"{num_seeds} randomly generated source-code "
f"file{'s' if num_seeds != 1 else ''}..."
) )
bugs: list[FuzzResult] = [] bugs: list[FuzzResult] = []
with concurrent.futures.ProcessPoolExecutor() as executor: with concurrent.futures.ProcessPoolExecutor() as executor:
@ -229,7 +239,8 @@ def run_fuzzer_sequentially(args: ResolvedCliArgs) -> list[FuzzResult]:
num_seeds = len(args.seeds) num_seeds = len(args.seeds)
print( print(
f"Sequentially running the fuzzer on " f"Sequentially running the fuzzer on "
f"{num_seeds} randomly generated source-code files..." f"{num_seeds} randomly generated source-code "
f"file{'s' if num_seeds != 1 else ''}..."
) )
bugs: list[FuzzResult] = [] bugs: list[FuzzResult] = []
for i, seed in enumerate(args.seeds, start=1): for i, seed in enumerate(args.seeds, start=1):