Fix ANSI escape codes for colored output not handled correctly with pytest.fail(..., pytrace=False) #12959
+29
−7
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
psf-chronographer
bot
added
the
bot:chronographer:provided
leonarduschen
changed the title
leonarduschen
commented
Nov 14, 2024
| @@ -119,8 +119,8 @@ def markup(self, text, **kw): | |||
| return text | |||
|
|
|||
| def get_write_msg(self, idx): | |||
| flag, msg = self.lines[idx] | |||
| assert flag == TWMock.WRITE | |||
| assert self.lines[idx][0] == TWMock.WRITE | |||
There was a problem hiding this comment.
Added this so that calling get_write_msg raises AssertionError instead of ValueError: Not enough values to unpack
I can revert it back if needed
leonarduschen
commented
Nov 14, 2024
| @@ -1221,6 +1221,12 @@ def _write_entry_lines(self, tw: TerminalWriter) -> None: | |||
| if not self.lines: | |||
| return | |||
|
|
|||
| if self.style == "value": | |||
| for line in self.lines: | |||
| tw.write(line) | |||
There was a problem hiding this comment.
Using TerminalWriter.write instead of TerminalWriter.line because when using TWMock . we can't distinguish lines written with TWMock._write_source and lines written with line directly, whereas with TWMock.write we can, with the flag.
We could add a flag for TWMock._write_source as well, like so:
class TWMock:
WRITE = object()
WRITE_SOURCE = object()
def _write_source(self, lines, indents=()):
if not indents:
indents = [""] * len(lines)
for indent, line in zip(indents, lines):
newline = indent + line
self.line((TWMock.WRITE_SOURCE, newline))But then we'll have to change around half the test cases in test_excinfo.py
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Closes #12849
closes #XYZWto the PR description and/or commits (whereXYZWis the issue number). See the github docs for more information.changelogfolder, with a name like<ISSUE NUMBER>.<TYPE>.rst. See changelog/README.rst for details.AUTHORSin alphabetical order.