From 7d730bf3a3df60f049ca91ac065c0e4390b99f2c Mon Sep 17 00:00:00 2001 From: RhodeCode Admin Date: Wed, 21 Jan 2026 17:53:52 +0100 Subject: [PATCH] fix(tests): use random suffix for vcs operations --- .../test_vcs_operations_branch_protection.py | 4 ++-- .../vcs_operations/test_vcs_operations_force_push.py | 8 ++++---- rhodecode/tests/vcs_operations/test_vcs_operations_git.py | 2 +- rhodecode/tests/vcs_operations/test_vcs_operations_hg.py | 2 +- .../vcs_operations/test_vcs_operations_new_branch_push.py | 8 ++++---- .../test_vcs_operations_rcextensions_push.py | 4 ++-- rhodecode/tests/vcs_operations/test_vcs_operations_svn.py | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py index cb7a147e..12eda558 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_branch_protection.py @@ -51,7 +51,7 @@ class TestVCSOperations(object): def test_push_to_protected_branch_fails_with_message_hg( self, rcstack, tmpdir, branch_perm, user_util, branch_permission_setter, username, password ): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) repo_name = repo.repo_name branch_permission_setter(repo_name, username, permission=branch_perm) @@ -86,7 +86,7 @@ class TestVCSOperations(object): def test_push_to_protected_branch_fails_with_message_git( self, rcstack, tmpdir, branch_perm, user_util, branch_permission_setter, username, password ): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) repo_name = repo.repo_name branch_permission_setter(repo_name, username, permission=branch_perm) diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py b/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py index f4fb1532..a565e5b2 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_force_push.py @@ -38,7 +38,7 @@ from rhodecode.tests.vcs_operations import ( ) class TestVCSOperations(object): def test_push_force_hg(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("hg clone", clone_url, tmpdir.strpath) @@ -54,7 +54,7 @@ class TestVCSOperations(object): _check_proper_hg_push(stdout, stderr) def test_push_force_git(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("git clone", clone_url, tmpdir.strpath) @@ -68,7 +68,7 @@ class TestVCSOperations(object): assert "(forced update)" in stderr def test_push_force_hg_blocked_by_branch_permissions(self, rcstack, tmpdir, user_util, branch_permission_setter): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) repo_name = repo.repo_name username = TEST_USER_ADMIN_LOGIN @@ -89,7 +89,7 @@ class TestVCSOperations(object): assert "FORCE PUSH FORBIDDEN" in stderr def test_push_force_git_blocked_by_branch_permissions(self, rcstack, tmpdir, user_util, branch_permission_setter): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) repo_name = repo.repo_name username = TEST_USER_ADMIN_LOGIN branch_permission_setter(repo_name, username, permission="branch.push") diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_git.py b/rhodecode/tests/vcs_operations/test_vcs_operations_git.py index 9b504ebe..0d4335fb 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_git.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_git.py @@ -127,7 +127,7 @@ class TestVCSOperationsGit: assert "not found" in stderr def test_clone_non_existing_store_path_git(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) # Damage repo by removing it's folder diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_hg.py b/rhodecode/tests/vcs_operations/test_vcs_operations_hg.py index 670ca508..298cc9e8 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_hg.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_hg.py @@ -102,7 +102,7 @@ class TestVCSOperationsHg(object): assert "HTTP Error 404: Not Found" in stderr def test_clone_non_existing_store_path_hg(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo() + repo = user_util.create_repo(random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) # Damage repo by removing it's folder diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py b/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py index 95588049..35212a80 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_new_branch_push.py @@ -31,7 +31,7 @@ from rhodecode.tests.vcs_operations import Command, _check_proper_hg_push, _chec ) class TestVCSOperationsNewBranchPush(object): def test_push_new_branch_hg(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("hg clone", clone_url, tmpdir.strpath) @@ -47,7 +47,7 @@ class TestVCSOperationsNewBranchPush(object): _check_proper_hg_push(stdout, stderr) def test_push_new_branch_git(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("git clone", clone_url, tmpdir.strpath) @@ -65,7 +65,7 @@ class TestVCSOperationsNewBranchPush(object): def test_push_new_branch_hg_with_branch_permissions_no_force_push( self, rcstack, tmpdir, user_util, branch_permission_setter ): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) repo_name = repo.repo_name username = TEST_USER_ADMIN_LOGIN branch_permission_setter(repo_name, username, permission="branch.push") @@ -87,7 +87,7 @@ class TestVCSOperationsNewBranchPush(object): def test_push_new_branch_git_with_branch_permissions_no_force_push( self, rcstack, tmpdir, user_util, branch_permission_setter ): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) repo_name = repo.repo_name username = TEST_USER_ADMIN_LOGIN branch_permission_setter(repo_name, username, permission="branch.push") diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_rcextensions_push.py b/rhodecode/tests/vcs_operations/test_vcs_operations_rcextensions_push.py index db2565d0..bab0bc50 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_rcextensions_push.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_rcextensions_push.py @@ -32,7 +32,7 @@ from rhodecode.tests.vcs_operations import Command, _check_proper_hg_push, _chec ) class TestVCSOperationsWithRCExtensions(object): def test_push_when_rcextensions_fail_hg(self, rcstack, tmpdir, user_util, rcextensions, rcextensions_modification): - repo = user_util.create_repo(repo_type="hg") + repo = user_util.create_repo(repo_type="hg", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("hg clone", clone_url, tmpdir.strpath) @@ -53,7 +53,7 @@ class TestVCSOperationsWithRCExtensions(object): assert "HOOK_FAIL_TEST_HG" in stdout def test_push_when_rcextensions_fail_git(self, rcstack, tmpdir, user_util, rcextensions, rcextensions_modification): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) Command(os.path.dirname(tmpdir.strpath)).execute("git clone", clone_url, tmpdir.strpath) diff --git a/rhodecode/tests/vcs_operations/test_vcs_operations_svn.py b/rhodecode/tests/vcs_operations/test_vcs_operations_svn.py index d4b78eb7..3e511efa 100644 --- a/rhodecode/tests/vcs_operations/test_vcs_operations_svn.py +++ b/rhodecode/tests/vcs_operations/test_vcs_operations_svn.py @@ -141,7 +141,7 @@ class TestVCSOperationsSVN(object): assert "not found" in stderr def test_clone_non_existing_store_path_svn(self, rcstack, tmpdir, user_util): - repo = user_util.create_repo(repo_type="git") + repo = user_util.create_repo(repo_type="git", random_suffix=True) clone_url = rcstack.repo_clone_url(repo.repo_name) # Damage repo by removing it's folder