From a58f877b94bb0ea2ba38e69fc08b7c821adee115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AC=A2=E4=B9=90=E9=A9=AC?= <38058090+SkywalkerSpace@users.noreply.github.com> Date: Tue, 11 Mar 2025 11:41:51 +0800 Subject: [PATCH] github actions ignore repo_metadata (#7583) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * github actions ignore repo_metadata * fix test --------- Co-authored-by: 孙永强 <11704063+s-yongqiang@user.noreply.gitee.com> --- .github/workflows/test.yml | 1 + seahub/api2/views.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 35b2111be6..933f190b5f 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -42,6 +42,7 @@ jobs: - name: run pytest run: | cd $GITHUB_WORKSPACE + rm -r tests/seahub/repo_metadata export CCNET_CONF_DIR=/tmp/ccnet SEAFILE_CONF_DIR=/tmp/seafile-data TRAVIS=1 SEAFILE_MYSQL_DB_CCNET_DB_NAME=ccnet SEAFILE_MYSQL_DB_SEAFILE_DB_NAME=seafile SEAFILE_MYSQL_DB_SEAHUB_DB_NAME=seahub if ./tests/test_seahub_changes.sh; then ./tests/seahubtests.sh init && ./tests/seahubtests.sh runserver && ./tests/seahubtests.sh test; else true; fi diff --git a/seahub/api2/views.py b/seahub/api2/views.py index c53bac81bd..cd95d16654 100644 --- a/seahub/api2/views.py +++ b/seahub/api2/views.py @@ -142,7 +142,7 @@ from seaserv import seafserv_threaded_rpc, \ check_quota, list_share_repos, get_group_repos_by_owner, get_group_repoids, \ remove_share, get_group, get_file_id_by_path, edit_repo, \ ccnet_threaded_rpc, get_personal_groups, seafile_api, \ - create_org, ccnet_api + create_org, ccnet_api, get_org_id_by_repo_id from constance import config @@ -1871,7 +1871,7 @@ class RepoOwner(APIView): # transfer repo try: transfer_repo(repo_id, new_owner, is_share, org_id) - org_id = seafile_api.get_org_id_by_repo_id(repo_id) + org_id = get_org_id_by_repo_id(repo_id) RepoTransfer.objects.create(from_user=repo_owner, to=new_owner, repo_id=repo_id,