From 32055f90481878c81de3ca4c233a7fc44a3d770e Mon Sep 17 00:00:00 2001 From: Peter Bieringer Date: Tue, 14 Apr 2026 09:47:31 +0200 Subject: [PATCH] storage/test/symlink: fix path concat --- radicale/tests/test_storage.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/radicale/tests/test_storage.py b/radicale/tests/test_storage.py index 6108ad4b..798f4888 100644 --- a/radicale/tests/test_storage.py +++ b/radicale/tests/test_storage.py @@ -194,15 +194,15 @@ class TestMultiFileSystem(BaseTest): def test_collection_sharing_by_softlink(self) -> None: """Test collection sharing by softlink.""" self.configure({"auth": {"type": "none"}}) - path_group_col = "/group/calendar-shared.ics/" + path_group_col = "group/calendar-shared.ics" file_item = "event1.ics" - self.mkcalendar(path_group_col, login="group:grouppw") + self.mkcalendar("/" + path_group_col + "/", login="group:grouppw") event = get_file_content(file_item) self.put(os.path.join(path_group_col, file_item), event) - fs_path_group_col = self.colpath + "/collection-root" + path_group_col - fs_path_group_col_rel = ".." + path_group_col - fs_path_user = self.colpath + "/collection-root/user" - fs_path_user_col = self.colpath + "/collection-root/user/calendar-group.ics" + fs_path_group_col = os.path.join(self.colpath, "collection-root", path_group_col) + fs_path_group_col_rel = os.path.join("..", path_group_col) + fs_path_user = os.path.join(self.colpath, "collection-root", "user") + fs_path_user_col = os.path.join(self.colpath, "collection-root", "user", "calendar-group.ics") logger.debug("colpath=%r fs_path_group_col=%r", self.colpath, fs_path_group_col) assert os.path.isdir(fs_path_group_col) # create user directory and check