From 7ef9da1f02f517d5db758117439edf289087cd7f Mon Sep 17 00:00:00 2001 From: Ran Benita Date: Mon, 10 Jun 2024 11:41:10 +0300 Subject: [PATCH] terminalwriter: improve `PYTEST_THEME`, `PYTEST_THEME_MODE` usage errors --- src/_pytest/_io/terminalwriter.py | 8 ++++---- testing/test_terminal.py | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/_pytest/_io/terminalwriter.py b/src/_pytest/_io/terminalwriter.py index 26344fd31..083c18232 100644 --- a/src/_pytest/_io/terminalwriter.py +++ b/src/_pytest/_io/terminalwriter.py @@ -235,13 +235,13 @@ class TerminalWriter: except pygments.util.ClassNotFound as e: raise UsageError( - f"PYTEST_THEME environment variable had an invalid value: '{theme}'. " - "Only valid pygment styles are allowed." + f"PYTEST_THEME environment variable has an invalid value: '{theme}'. " + "Hint: See available pygments styles with `pygmentize -L styles`." ) from e except pygments.util.OptionError as e: raise UsageError( - f"PYTEST_THEME_MODE environment variable had an invalid value: '{theme_mode}'. " - "The only allowed values are 'dark' and 'light'." + f"PYTEST_THEME_MODE environment variable has an invalid value: '{theme_mode}'. " + "The allowed values are 'dark' (default) and 'light'." ) from e def _highlight( diff --git a/testing/test_terminal.py b/testing/test_terminal.py index 6cd4a1827..ce9fdc50c 100644 --- a/testing/test_terminal.py +++ b/testing/test_terminal.py @@ -2609,8 +2609,8 @@ class TestCodeHighlight: monkeypatch.setenv("PYTEST_THEME", "invalid") result = pytester.runpytest_subprocess("--color=yes") result.stderr.fnmatch_lines( - "ERROR: PYTEST_THEME environment variable had an invalid value: 'invalid'. " - "Only valid pygment styles are allowed." + "ERROR: PYTEST_THEME environment variable has an invalid value: 'invalid'. " + "Hint: See available pygments styles with `pygmentize -L styles`." ) def test_code_highlight_invalid_theme_mode( @@ -2625,8 +2625,8 @@ class TestCodeHighlight: monkeypatch.setenv("PYTEST_THEME_MODE", "invalid") result = pytester.runpytest_subprocess("--color=yes") result.stderr.fnmatch_lines( - "ERROR: PYTEST_THEME_MODE environment variable had an invalid value: 'invalid'. " - "The only allowed values are 'dark' and 'light'." + "ERROR: PYTEST_THEME_MODE environment variable has an invalid value: 'invalid'. " + "The allowed values are 'dark' (default) and 'light'." )