From 3c8e7dfe36c002bfe2e8ddf50ed165b78fd5e257 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Duffeck?= Date: Thu, 21 Nov 2024 11:21:56 +0100 Subject: [PATCH] Use the user id instead of username for the space root to avoid clashes --- .drone.star | 2 +- tests/oc-integration-tests/drone/storage-users-posixfs.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.star b/.drone.star index b42526c117..2256771cfb 100644 --- a/.drone.star +++ b/.drone.star @@ -761,7 +761,7 @@ def posixfsIntegrationTests(parallelRuns, skipExceptParts = []): "environment": { "TEST_SERVER_URL": "http://revad-services:20080", "OCIS_REVA_DATA_ROOT": "/drone/src/tmp/reva/data/", - "DELETE_USER_DATA_CMD": "bash -cx 'for i in {1..30}; do rm -rf /drone/src/tmp/reva/data/users/* /drone/src/tmp/reva/data/indexes/by-type/* && break || sleep 5; done; sleep 1'", + "DELETE_USER_DATA_CMD": "bash -cx 'rm -rf /drone/src/tmp/reva/data/users/* /drone/src/tmp/reva/data/indexes/by-type/*'", "STORAGE_DRIVER": "ocis", "SKELETON_DIR": "/drone/src/tmp/testing/data/apiSkeleton", "TEST_WITH_LDAP": "true", diff --git a/tests/oc-integration-tests/drone/storage-users-posixfs.toml b/tests/oc-integration-tests/drone/storage-users-posixfs.toml index 212fabdafe..4813f9e284 100644 --- a/tests/oc-integration-tests/drone/storage-users-posixfs.toml +++ b/tests/oc-integration-tests/drone/storage-users-posixfs.toml @@ -24,7 +24,7 @@ root = "/drone/src/tmp/reva/data" permissionssvc = "localhost:10000" treetime_accounting = true treesize_accounting = true -personalspacepath_template = "users/{{.User.Username}}" +personalspacepath_template = "users/{{.User.Id.OpaqueId}}" generalspacepath_template = "projects/{{.SpaceId}}" watch_fs = true