Avii/Radicale
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

storage/test/collision: fix for hfs+ and cosmetics

Browse Source
This commit is contained in:
Peter Bieringer
2026-04-15 05:55:07 +02:00
parent a6d7fcf1b9
commit 33ffc27384
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
radicale/tests/test_storage.py
View File

@@ -222,7 +222,7 @@ class TestMultiFileSystem(BaseTest):
"""Test for colliding files on file systems.""" """Test for colliding files on file systems."""
caplog.set_level(logging.WARNING) caplog.set_level(logging.WARNING)
self.configure({"logging": {"request_content_on_debug": "False"}}) self.configure({"logging": {"request_content_on_debug": "False"}})
fs_collision_free = pathutils.path_is_collision_free_case_sensitive(tempfile.mkdtemp()) fs_collision_free = pathutils.path_is_collision_free_case_sensitive(self.colpath)
file_item = "EvEnT1.iCs" file_item = "EvEnT1.iCs"
path_coll = "/calendar.ics/" path_coll = "/calendar.ics/"
self.mkcalendar(path_coll) self.mkcalendar(path_coll)
@@ -244,7 +244,7 @@ class TestMultiFileSystem(BaseTest):
"""Test for colliding dirs on file systems.""" """Test for colliding dirs on file systems."""
caplog.set_level(logging.WARNING) caplog.set_level(logging.WARNING)
self.configure({"logging": {"request_content_on_debug": "False"}}) self.configure({"logging": {"request_content_on_debug": "False"}})
fs_collision_free = pathutils.path_is_collision_free_case_sensitive(tempfile.mkdtemp()) fs_collision_free = pathutils.path_is_collision_free_case_sensitive(self.colpath)
path_coll = "/CaLeNdAr.ics/" path_coll = "/CaLeNdAr.ics/"
self.mkcalendar(path_coll) self.mkcalendar(path_coll)
if fs_collision_free: if fs_collision_free:
@@ -264,12 +264,16 @@ class TestMultiFileSystem(BaseTest):
"""Test for colliding dirs (shortname) on file systems.""" """Test for colliding dirs (shortname) on file systems."""
caplog.set_level(logging.WARNING) caplog.set_level(logging.WARNING)
self.configure({"logging": {"request_content_on_debug": "False"}}) self.configure({"logging": {"request_content_on_debug": "False"}})
fs_collision_free = pathutils.path_is_collision_free_no_short_filename(tempfile.mkdtemp()) fs_collision_free = pathutils.path_is_collision_free_no_short_filename(self.colpath)
fs_collision_free_case_sensitive = pathutils.path_is_collision_free_case_sensitive(self.colpath)
path_coll = "/calendarlongname.ics/" path_coll = "/calendarlongname.ics/"
path_coll_short = "/calend~1.ics/" path_coll_short = "/calend~1.ics/"
self.mkcalendar(path_coll) self.mkcalendar(path_coll)
if fs_collision_free: if fs_collision_free:
self.mkcalendar(path_coll_short.lower(), check=201) self.mkcalendar(path_coll_short.lower(), check=201)
if not fs_collision_free_case_sensitive:
# cleanup to avoid collision below
self.delete(path_coll_short.lower())
else: else:
self.mkcalendar(path_coll_short.lower(), check=409) self.mkcalendar(path_coll_short.lower(), check=409)
logs = caplog.messages logs = caplog.messages