Skip to content

Skip InvalidNormalization assertion on filename-normalizing platforms #383

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

Merged
jelmer merged 1 commit into from
May 24, 2026
Merged

Skip InvalidNormalization assertion on filename-normalizing platforms #383

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 15 additions & 8 deletions breezy/bzr/tests/test_inv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,14 +980,21 @@ def test_make_entry(self):
def test_make_entry_non_normalized(self):
from bzrformats.errors import InvalidNormalization

# bzrformats rejects un-normalized names at construction time.
self.assertRaises(
InvalidNormalization,
inventory.make_entry,
"file",
"a\u030a",
ROOT_ID,
)
if osutils.normalizes_filenames():
# On platforms that normalize filenames (e.g. macOS), the
# decomposed form is accepted and normalized to NFC.
entry = inventory.make_entry("file", "a\u030a", ROOT_ID)
self.assertEqual("\xe5", entry.name)
self.assertIsInstance(entry, inventory.InventoryFile)
else:
# Elsewhere, bzrformats rejects un-normalized names.
self.assertRaises(
InvalidNormalization,
inventory.make_entry,
"file",
"a\u030a",
ROOT_ID,
)
# Already-normalized names are accepted.
entry = inventory.make_entry("file", "\xe5", ROOT_ID)
self.assertEqual("\xe5", entry.name)
Expand Down
Loading