Skip to content

Commit c72347c

Browse files
authored
Merge pull request #2001 from pbiering/feature-sharing-permissions-windows
fix testcase directories for windows
2 parents ad231f2 + 48e4cc6 commit c72347c

File tree

1 file changed

+16
-16
lines changed

1 file changed

+16
-16
lines changed

radicale/tests/test_sharing.py

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,19 +2223,19 @@ def test_sharing_api_permissions_rights(self) -> None:
22232223
permissions: RrWw
22242224
[owner1-T]
22252225
user: owner1
2226-
collection: {user}/cal-T(/.*)?
2226+
collection: {user}/cal-T-uc(/.*)?
22272227
permissions: RrWwT
22282228
[owner1-t]
22292229
user: owner1
2230-
collection: {user}/cal-t(/.*)?
2230+
collection: {user}/cal-t-lc(/.*)?
22312231
permissions: RrWwt
22322232
[owner1-M]
22332233
user: owner1
2234-
collection: {user}/cal-M(/.*)?
2234+
collection: {user}/cal-M-uc(/.*)?
22352235
permissions: RrWwM
22362236
[owner1-m]
22372237
user: owner1
2238-
collection: {user}/cal-m(/.*)?
2238+
collection: {user}/cal-m-lc(/.*)?
22392239
permissions: RrWwm
22402240
[default]
22412241
user: .+
@@ -2261,10 +2261,10 @@ def test_sharing_api_permissions_rights(self) -> None:
22612261
json_dict: dict
22622262

22632263
path_user1 = "/user1/calendarPGu1.ics/"
2264-
path_owner1_T = "/owner1/cal-T/"
2265-
path_owner1_t = "/owner1/cal-t/"
2266-
path_owner1_M = "/owner1/cal-M/"
2267-
path_owner1_m = "/owner1/cal-m/"
2264+
path_owner1_T = "/owner1/cal-T-uc/"
2265+
path_owner1_t = "/owner1/cal-t-lc/"
2266+
path_owner1_M = "/owner1/cal-M-uc/"
2267+
path_owner1_m = "/owner1/cal-m-lc/"
22682268

22692269
logging.info("\n*** prepare")
22702270
self.mkcalendar(path_owner1_T, login="owner1:owner1pw")
@@ -2288,45 +2288,45 @@ def test_sharing_api_permissions_rights(self) -> None:
22882288

22892289
logging.info("\n*** create map user1/owner1, globally disabled / not granted M -> 403")
22902290
json_dict['PathMapped'] = path_owner1_M
2291-
json_dict['PathOrToken'] = path_user1 + "dM" + db_type
2291+
json_dict['PathOrToken'] = path_user1 + "dM-uc" + db_type
22922292
_, headers, answer = self._sharing_api_json("map", "create", check=403, login="owner1:owner1pw", json_dict=json_dict)
22932293

22942294
logging.info("\n*** create map user1/owner1, globally disabled / not granted T -> 403")
22952295
json_dict['PathMapped'] = path_owner1_T
2296-
json_dict['PathOrToken'] = path_user1 + "dT" + db_type
2296+
json_dict['PathOrToken'] = path_user1 + "dT-uc" + db_type
22972297
_, headers, answer = self._sharing_api_json("map", "create", check=403, login="owner1:owner1pw", json_dict=json_dict)
22982298

22992299
logging.info("\n*** create map user1/owner1, globally disabled / not granted t -> 403")
23002300
json_dict['PathMapped'] = path_owner1_t
2301-
json_dict['PathOrToken'] = path_user1 + "dt" + db_type
2301+
json_dict['PathOrToken'] = path_user1 + "dt-lc" + db_type
23022302
_, headers, answer = self._sharing_api_json("map", "create", check=403, login="owner1:owner1pw", json_dict=json_dict)
23032303

23042304
logging.info("\n*** create map user1/owner1, globally disabled / granted m -> 200")
23052305
json_dict['PathMapped'] = path_owner1_m
2306-
json_dict['PathOrToken'] = path_user1 + "dm" + db_type
2306+
json_dict['PathOrToken'] = path_user1 + "dm-lc" + db_type
23072307
_, headers, answer = self._sharing_api_json("map", "create", check=200, login="owner1:owner1pw", json_dict=json_dict)
23082308

23092309
logging.info("\n*** create map user1/owner1, globally enabled")
23102310
self.configure({"sharing": {"permit_create_map": "True"}})
23112311

23122312
logging.info("\n*** create map user1/owner1, globally enabled / not granted M -> 403")
23132313
json_dict['PathMapped'] = path_owner1_M
2314-
json_dict['PathOrToken'] = path_user1 + "eM" + db_type
2314+
json_dict['PathOrToken'] = path_user1 + "eM-uc" + db_type
23152315
_, headers, answer = self._sharing_api_json("map", "create", check=403, login="owner1:owner1pw", json_dict=json_dict)
23162316

23172317
logging.info("\n*** create map user1/owner1, globally enabled / ignore T -> 200")
23182318
json_dict['PathMapped'] = path_owner1_T
2319-
json_dict['PathOrToken'] = path_user1 + "eT" + db_type
2319+
json_dict['PathOrToken'] = path_user1 + "eT-uc" + db_type
23202320
_, headers, answer = self._sharing_api_json("map", "create", check=200, login="owner1:owner1pw", json_dict=json_dict)
23212321

23222322
logging.info("\n*** create map user1/owner1, globally enabled / ignore t -> 200")
23232323
json_dict['PathMapped'] = path_owner1_t
2324-
json_dict['PathOrToken'] = path_user1 + "et" + db_type
2324+
json_dict['PathOrToken'] = path_user1 + "et-lc" + db_type
23252325
_, headers, answer = self._sharing_api_json("map", "create", check=200, login="owner1:owner1pw", json_dict=json_dict)
23262326

23272327
logging.info("\n*** create map user1/owner1, globally enabled / ignore m -> 200")
23282328
json_dict['PathMapped'] = path_owner1_m
2329-
json_dict['PathOrToken'] = path_user1 + "em" + db_type
2329+
json_dict['PathOrToken'] = path_user1 + "em-lc" + db_type
23302330
_, headers, answer = self._sharing_api_json("map", "create", check=200, login="owner1:owner1pw", json_dict=json_dict)
23312331

23322332
# create token

0 commit comments

Comments
 (0)