Skip to content

Make _raw output quotes only when the input is actually a string #395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ivanharvard wants to merge 2 commits into
base: fix/384/add-truncation-to-missing
Choose a base branch
from
Open

Make _raw output quotes only when the input is actually a string #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f45c87
convert to raw before truncation and improve list output
ivanharvard Feb 25, 2026
a73be89
update tests
ivanharvard Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions check50/_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -425,12 +425,10 @@ class Missing(Failure):
"""

def __init__(self, missing_item, collection, help=None):
if isinstance(collection, list):
collection = _process_list(collection, _raw)

missing_item, collection = _raw(missing_item), _raw(collection)
truncated_collection = _truncate(collection, missing_item)

super().__init__(rationale=_("Did not find {} in {}").format(_raw(missing_item), _raw(truncated_collection)), help=help)
super().__init__(rationale=_("Did not find {} in {}").format(missing_item, truncated_collection), help=help)

if missing_item == EOF:
missing_item = "EOF"
Expand Down Expand Up @@ -461,16 +459,17 @@ class Mismatch(Failure):
"""

def __init__(self, expected, actual, help=None):
expected, actual = _raw(expected), _raw(actual)
expected, actual = _truncate(expected, actual), _truncate(actual, expected)

rationale = _("expected: {}\n actual: {}").format(
_raw(expected),
_raw(actual)
expected,
actual
)

super().__init__(rationale=rationale, help=help)

self.payload.update({"expected": _raw(expected), "actual": _raw(actual)})
self.payload.update({"expected": expected, "actual": actual})


def hidden(failure_rationale):
Expand Down Expand Up @@ -609,9 +608,10 @@ def _raw(s):
return "EOF"
elif s == TIMEOUT:
return "TIMEOUT"

s = f'"{repr(str(s))[1:-1]}"'
return s
elif isinstance(s, list):
return "[{}]".format(", ".join(_raw(item) for item in s))

return repr(s)


def _copy(src, dst):
Expand Down
8 changes: 4 additions & 4 deletions tests/check50_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ def test_with_empty_file(self):
process.expect_exact("foo.py exists")
process.expect_exact(":(")
process.expect_exact("prints hello")
process.expect_exact("expected: \"hello\"")
process.expect_exact("actual: \"\"")
process.expect_exact("expected: 'hello'")
process.expect_exact("actual: ''")
process.close(force=True)


Expand Down Expand Up @@ -146,8 +146,8 @@ def test_with_empty_file(self):
process.expect_exact("foo.py exists")
process.expect_exact(":(")
process.expect_exact("prints hello name")
process.expect_exact("expected: \"hello bar\"")
process.expect_exact("actual: \"\"")
process.expect_exact("expected: 'hello bar'")
process.expect_exact("actual: ''")
process.close(force=True)

def test_with_correct_file(self):
Expand Down