engineering/unrhodecode
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

testing: fixed test routes

Browse source
This commit is contained in:
RhodeCode Admin 2023-10-05 21:24:21 +02:00
parent 6339fa0902
commit 0617a70667
2 changed files with 59 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

87
rhodecode/tests/routes.py
View file

@ -32,12 +32,14 @@ def get_url_defs():
"admin_home": ADMIN_PREFIX + "",
"admin_audit_logs": ADMIN_PREFIX + "/audit_logs",
"admin_defaults_repositories": ADMIN_PREFIX + "/defaults/repositories",
"admin_defaults_repositories_update": ADMIN_PREFIX + "/defaults/repositories/update",
"admin_defaults_repositories_update": ADMIN_PREFIX
+ "/defaults/repositories/update",
"search": ADMIN_PREFIX + "/search",
"search_repo": "/{repo_name}/search",
"my_account_auth_tokens": ADMIN_PREFIX + "/my_account/auth_tokens",
"my_account_auth_tokens_add": ADMIN_PREFIX + "/my_account/auth_tokens/new",
"my_account_auth_tokens_delete": ADMIN_PREFIX + "/my_account/auth_tokens/delete",
"my_account_auth_tokens_delete": ADMIN_PREFIX
+ "/my_account/auth_tokens/delete",
"repos": ADMIN_PREFIX + "/repos",
"repos_data": ADMIN_PREFIX + "/repos_data",
"repo_groups": ADMIN_PREFIX + "/repo_groups",
@ -93,77 +95,100 @@ def get_url_defs():
"gist_show": ADMIN_PREFIX + "/gists/{gist_id}",
"gist_delete": ADMIN_PREFIX + "/gists/{gist_id}/delete",
"gist_edit": ADMIN_PREFIX + "/gists/{gist_id}/edit",
"gist_edit_check_revision": ADMIN_PREFIX + "/gists/{gist_id}/edit/check_revision",
"gist_edit_check_revision": ADMIN_PREFIX
+ "/gists/{gist_id}/edit/check_revision",
"gist_update": ADMIN_PREFIX + "/gists/{gist_id}/update",
"gist_show_rev": ADMIN_PREFIX + "/gists/{gist_id}/rev/{revision}",
"gist_show_formatted": ADMIN_PREFIX + "/gists/{gist_id}/rev/{revision}/{format}",
"gist_show_formatted_path": ADMIN_PREFIX + "/gists/{gist_id}/rev/{revision}/{format}/{f_path}",
"gist_show_formatted": ADMIN_PREFIX
+ "/gists/{gist_id}/rev/{revision}/{format}",
"gist_show_formatted_path": ADMIN_PREFIX
+ "/gists/{gist_id}/rev/{revision}/{format}/{f_path}",
"login": ADMIN_PREFIX + "/login",
"logout": ADMIN_PREFIX + "/logout",
"register": ADMIN_PREFIX + "/register",
"reset_password": ADMIN_PREFIX + "/password_reset",
"reset_password_confirmation": ADMIN_PREFIX + "/password_reset_confirmation",
"admin_permissions_application": ADMIN_PREFIX + "/permissions/application",
"admin_permissions_application_update": ADMIN_PREFIX + "/permissions/application/update",
"admin_permissions_application_update": ADMIN_PREFIX
+ "/permissions/application/update",
"repo_commit_raw": "/{repo_name}/changeset-diff/{commit_id}",
"user_group_members_data": ADMIN_PREFIX + "/user_groups/{user_group_id}/members",
"user_group_members_data": ADMIN_PREFIX
+ "/user_groups/{user_group_id}/members",
"user_groups_new": ADMIN_PREFIX + "/user_groups/new",
"user_groups_create": ADMIN_PREFIX + "/user_groups/create",
"edit_user_group": ADMIN_PREFIX + "/user_groups/{user_group_id}/edit",
"edit_user_group_advanced_sync": ADMIN_PREFIX + "/user_groups/{user_group_id}/edit/advanced/sync",
"edit_user_group_global_perms_update": ADMIN_PREFIX + "/user_groups/{user_group_id}/edit/global_permissions/update",
"edit_user_group_advanced_sync": ADMIN_PREFIX
+ "/user_groups/{user_group_id}/edit/advanced/sync",
"edit_user_group_global_perms_update": ADMIN_PREFIX
+ "/user_groups/{user_group_id}/edit/global_permissions/update",
"user_groups_update": ADMIN_PREFIX + "/user_groups/{user_group_id}/update",
"user_groups_delete": ADMIN_PREFIX + "/user_groups/{user_group_id}/delete",
"edit_user_group_perms": ADMIN_PREFIX + "/user_groups/{user_group_id}/edit/permissions",
"edit_user_group_perms_update": ADMIN_PREFIX + "/user_groups/{user_group_id}/edit/permissions/update",
"edit_user_group_perms": ADMIN_PREFIX
+ "/user_groups/{user_group_id}/edit/permissions",
"edit_user_group_perms_update": ADMIN_PREFIX
+ "/user_groups/{user_group_id}/edit/permissions/update",
"edit_repo_group": "/{repo_group_name}/_edit",
"edit_repo_group_perms": "/{repo_group_name:}/_settings/permissions",
"edit_repo_group_perms_update": "/{repo_group_name}/_settings/permissions/update",
"edit_repo_group_advanced": "/{repo_group_name}/_settings/advanced",
"edit_repo_group_advanced_delete": "/{repo_group_name}/_settings/advanced/delete",
"edit_user_ssh_keys": ADMIN_PREFIX + "/users/{user_id}/edit/ssh_keys",
"edit_user_ssh_keys_generate_keypair": ADMIN_PREFIX + "/users/{user_id}/edit/ssh_keys/generate",
"edit_user_ssh_keys_generate_keypair": ADMIN_PREFIX
+ "/users/{user_id}/edit/ssh_keys/generate",
"edit_user_ssh_keys_add": ADMIN_PREFIX + "/users/{user_id}/edit/ssh_keys/new",
"edit_user_ssh_keys_delete": ADMIN_PREFIX + "/users/{user_id}/edit/ssh_keys/delete",
"edit_user_ssh_keys_delete": ADMIN_PREFIX
+ "/users/{user_id}/edit/ssh_keys/delete",
"users": ADMIN_PREFIX + "/users",
"users_data": ADMIN_PREFIX + "/users_data",
"users_create": ADMIN_PREFIX + "/users/create",
"users_new": ADMIN_PREFIX + "/users/new",
"user_edit": ADMIN_PREFIX + "/users/{user_id}/edit",
"user_edit_advanced": ADMIN_PREFIX + "/users/{user_id}/edit/advanced",
"user_edit_global_perms": ADMIN_PREFIX + "/users/{user_id}/edit/global_permissions",
"user_edit_global_perms_update": ADMIN_PREFIX + "/users/{user_id}/edit/global_permissions/update",
"user_edit_global_perms": ADMIN_PREFIX
+ "/users/{user_id}/edit/global_permissions",
"user_edit_global_perms_update": ADMIN_PREFIX
+ "/users/{user_id}/edit/global_permissions/update",
"user_update": ADMIN_PREFIX + "/users/{user_id}/update",
"user_delete": ADMIN_PREFIX + "/users/{user_id}/delete",
"user_create_personal_repo_group": ADMIN_PREFIX + "/users/{user_id}/create_repo_group",
"user_create_personal_repo_group": ADMIN_PREFIX
+ "/users/{user_id}/create_repo_group",
"edit_user_auth_tokens": ADMIN_PREFIX + "/users/{user_id}/edit/auth_tokens",
"edit_user_auth_tokens_add": ADMIN_PREFIX + "/users/{user_id}/edit/auth_tokens/new",
"edit_user_auth_tokens_delete": ADMIN_PREFIX + "/users/{user_id}/edit/auth_tokens/delete",
"edit_user_auth_tokens_add": ADMIN_PREFIX
+ "/users/{user_id}/edit/auth_tokens/new",
"edit_user_auth_tokens_delete": ADMIN_PREFIX
+ "/users/{user_id}/edit/auth_tokens/delete",
"edit_user_emails": ADMIN_PREFIX + "/users/{user_id}/edit/emails",
"edit_user_emails_add": ADMIN_PREFIX + "/users/{user_id}/edit/emails/new",
"edit_user_emails_delete": ADMIN_PREFIX + "/users/{user_id}/edit/emails/delete",
"edit_user_ips": ADMIN_PREFIX + "/users/{user_id}/edit/ips",
"edit_user_ips_add": ADMIN_PREFIX + "/users/{user_id}/edit/ips/new",
"edit_user_ips_delete": ADMIN_PREFIX + "/users/{user_id}/edit/ips/delete",
"edit_user_perms_summary": ADMIN_PREFIX + "/users/{user_id}/edit/permissions_summary",
"edit_user_perms_summary_json": ADMIN_PREFIX + "/users/{user_id}/edit/permissions_summary/json",
"edit_user_perms_summary": ADMIN_PREFIX
+ "/users/{user_id}/edit/permissions_summary",
"edit_user_perms_summary_json": ADMIN_PREFIX
+ "/users/{user_id}/edit/permissions_summary/json",
"edit_user_audit_logs": ADMIN_PREFIX + "/users/{user_id}/edit/audit",
"edit_user_audit_logs_download": ADMIN_PREFIX + "/users/{user_id}/edit/audit/download",
"edit_user_audit_logs_download": ADMIN_PREFIX
+ "/users/{user_id}/edit/audit/download",
"admin_settings": ADMIN_PREFIX + "/settings",
"admin_settings_update": ADMIN_PREFIX + "/settings/update",
"admin_settings_global": ADMIN_PREFIX + "/settings/global",
"admin_settings_global_update": ADMIN_PREFIX + "/settings/global/update",
"admin_settings_vcs": ADMIN_PREFIX + "/settings/vcs",
"admin_settings_vcs_update": ADMIN_PREFIX + "/settings/vcs/update",
"admin_settings_vcs_svn_pattern_delete": ADMIN_PREFIX + "/settings/vcs/svn_pattern_delete",
"admin_settings_vcs_svn_pattern_delete": ADMIN_PREFIX
+ "/settings/vcs/svn_pattern_delete",
"admin_settings_mapping": ADMIN_PREFIX + "/settings/mapping",
"admin_settings_mapping_update": ADMIN_PREFIX + "/settings/mapping/update",
"admin_settings_visual": ADMIN_PREFIX + "/settings/visual",
"admin_settings_visual_update": ADMIN_PREFIX + "/settings/visual/update",
"admin_settings_issuetracker": ADMIN_PREFIX + "/settings/issue-tracker",
"admin_settings_issuetracker_update": ADMIN_PREFIX + "/settings/issue-tracker/update",
"admin_settings_issuetracker_test": ADMIN_PREFIX + "/settings/issue-tracker/test",
"admin_settings_issuetracker_delete": ADMIN_PREFIX + "/settings/issue-tracker/delete",
"admin_settings_issuetracker_update": ADMIN_PREFIX
+ "/settings/issue-tracker/update",
"admin_settings_issuetracker_test": ADMIN_PREFIX
+ "/settings/issue-tracker/test",
"admin_settings_issuetracker_delete": ADMIN_PREFIX
+ "/settings/issue-tracker/delete",
"admin_settings_email": ADMIN_PREFIX + "/settings/email",
"admin_settings_email_update": ADMIN_PREFIX + "/settings/email/update",
"admin_settings_hooks": ADMIN_PREFIX + "/settings/hooks",
@ -189,7 +214,8 @@ def get_url_defs():
"admin_permissions_overview": ADMIN_PREFIX + "/permissions/overview",
"admin_permissions_ssh_keys": ADMIN_PREFIX + "/permissions/ssh_keys",
"admin_permissions_ssh_keys_data": ADMIN_PREFIX + "/permissions/ssh_keys/data",
"admin_permissions_ssh_keys_update": ADMIN_PREFIX + "/permissions/ssh_keys/update",
"admin_permissions_ssh_keys_update": ADMIN_PREFIX
+ "/permissions/ssh_keys/update",
"pullrequest_show": "/{repo_name}/pull-request/{pull_request_id}",
"pull_requests_global": ADMIN_PREFIX + "/pull-request/{pull_request_id}",
"pull_requests_global_0": ADMIN_PREFIX + "/pull_requests/{pull_request_id}",
@ -197,8 +223,10 @@ def get_url_defs():
"notifications_show_all": ADMIN_PREFIX + "/notifications",
"notifications_mark_all_read": ADMIN_PREFIX + "/notifications_mark_all_read",
"notifications_show": ADMIN_PREFIX + "/notifications/{notification_id}",
"notifications_update": ADMIN_PREFIX + "/notifications/{notification_id}/update",
"notifications_delete": ADMIN_PREFIX + "/notifications/{notification_id}/delete",
"notifications_update": ADMIN_PREFIX
+ "/notifications/{notification_id}/update",
"notifications_delete": ADMIN_PREFIX
+ "/notifications/{notification_id}/delete",
"my_account": ADMIN_PREFIX + "/my_account/profile",
"my_account_edit": ADMIN_PREFIX + "/my_account/edit",
"my_account_update": ADMIN_PREFIX + "/my_account/update",
@ -276,7 +304,8 @@ def get_url_defs():
"edit_repo_advanced_journal": "/{repo_name}/settings/advanced/journal",
"repo_stats": "/{repo_name}/repo_stats/{commit_id}",
"repo_refs_data": "/{repo_name}/refs-data",
"repo_refs_changelog_data": "/{repo_name}/refs-data-changelog"
"repo_refs_changelog_data": "/{repo_name}/refs-data-changelog",
"repo_artifacts_stream_store": "/_file_store/stream-upload",
}

2
rhodecode/tests/vcs/test_repository.py
View file

@ -369,7 +369,7 @@ class TestRepositoryMerge(object):
self.repo_id, self.workspace_id, self.target_ref, self.source_repo,
self.source_ref, dry_run=True)
# Multiple merges may differ in their commit id. Therefore we set the
# Multiple merges may differ in their commit id. Therefore, we set the
# commit id to `None` before comparing the merge responses.
new_merge_ref = merge_response.merge_ref.commit_id = None
merge_response.merge_ref = new_merge_ref