fix: renames variable
This commit is contained in:
parent
f9d7b95583
commit
06f04bb900
1 changed files with 5 additions and 5 deletions
|
|
@ -297,12 +297,12 @@ class TestRepositoryGetCommonAncestor:
|
|||
|
||||
@pytest.mark.backends("git", "hg")
|
||||
class TestRepositoryMerge(object):
|
||||
def prepare_for_success(self, vcsbackend, numer_of_source_commits=1):
|
||||
def prepare_for_success(self, vcsbackend, number_of_source_commits=1):
|
||||
self.target_repo = vcsbackend.create_repo(number_of_commits=1)
|
||||
self.source_repo = vcsbackend.clone_repo(self.target_repo)
|
||||
vcsbackend.add_file(self.target_repo, b"README_MERGE1", b"Version 1")
|
||||
vcsbackend.add_file(self.source_repo, b"README_MERGE2", b"Version 2")
|
||||
for i in range(numer_of_source_commits):
|
||||
for i in range(number_of_source_commits):
|
||||
imc = self.source_repo.in_memory_commit
|
||||
file = FileNode(("file_%s" % (i + 1)).encode(), content=self.source_repo.name)
|
||||
imc.add(file)
|
||||
|
|
@ -387,9 +387,9 @@ class TestRepositoryMerge(object):
|
|||
assert merge_commit.message.strip() == "merge message 1"
|
||||
assert merge_commit.author == "test user <test@rhodecode.com>"
|
||||
|
||||
@pytest.mark.parametrize("numer_of_source_commits", [10, 14, 20, 40])
|
||||
def test_squash_commits_success(self, vcsbackend, numer_of_source_commits):
|
||||
self.prepare_for_success(vcsbackend, numer_of_source_commits=numer_of_source_commits)
|
||||
@pytest.mark.parametrize("number_of_source_commits", [10, 14, 20, 40])
|
||||
def test_squash_commits_success(self, vcsbackend, number_of_source_commits):
|
||||
self.prepare_for_success(vcsbackend, number_of_source_commits=number_of_source_commits)
|
||||
|
||||
target_repo = backends.get_backend(vcsbackend.alias)(self.target_repo.path)
|
||||
target_repo_initial_count = len(target_repo.get_commits())
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue