From a26deb916cbdfceea505da00e78fbfb7c5e853d5 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Fri, 8 Jul 2016 09:15:03 +0200 Subject: [PATCH] tests: Add missing argument to assert_called_with statements. Added the `'use_rebase' argument to assert statements which was recently added to the merge method. --- rhodecode/tests/models/test_pullrequest.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/rhodecode/tests/models/test_pullrequest.py b/rhodecode/tests/models/test_pullrequest.py index a97de550..2d15d37d 100644 --- a/rhodecode/tests/models/test_pullrequest.py +++ b/rhodecode/tests/models/test_pullrequest.py @@ -157,7 +157,8 @@ class TestPullRequestModel: self.merge_mock.assert_called_once_with( pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), - pull_request.source_ref_parts, self.workspace_id, dry_run=True) + pull_request.source_ref_parts, self.workspace_id, dry_run=True, + use_rebase=False) assert pull_request._last_merge_source_rev == self.source_commit assert pull_request._last_merge_target_rev == self.target_commit @@ -185,7 +186,8 @@ class TestPullRequestModel: self.merge_mock.assert_called_once_with( pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), - pull_request.source_ref_parts, self.workspace_id, dry_run=True) + pull_request.source_ref_parts, self.workspace_id, dry_run=True, + use_rebase=False) assert pull_request._last_merge_source_rev == self.source_commit assert pull_request._last_merge_target_rev == self.target_commit @@ -216,7 +218,8 @@ class TestPullRequestModel: self.merge_mock.assert_called_once_with( pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), - pull_request.source_ref_parts, self.workspace_id, dry_run=True) + pull_request.source_ref_parts, self.workspace_id, dry_run=True, + use_rebase=False) assert pull_request._last_merge_source_rev is None assert pull_request._last_merge_target_rev is None @@ -289,7 +292,8 @@ class TestPullRequestModel: pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), pull_request.source_ref_parts, self.workspace_id, - user_name=user.username, user_email=user.email, message=message + user_name=user.username, user_email=user.email, message=message, + use_rebase=False ) self.invalidation_mock.assert_called_once_with( pull_request.target_repo.repo_name) @@ -327,7 +331,8 @@ class TestPullRequestModel: pull_request.target_ref_parts, pull_request.source_repo.scm_instance(), pull_request.source_ref_parts, self.workspace_id, - user_name=user.username, user_email=user.email, message=message + user_name=user.username, user_email=user.email, message=message, + use_rebase=False ) pull_request = PullRequest.get(pull_request.pull_request_id)