From 22dde6518a1780eec1ac2fa9169f321ff473dba8 Mon Sep 17 00:00:00 2001 From: Martin Bornhold Date: Thu, 27 Oct 2016 11:43:13 +0200 Subject: [PATCH] tests: Adapt tests to return value change. --- rhodecode/api/views/pull_request_api.py | 6 +++--- rhodecode/tests/models/test_changeset_status.py | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/rhodecode/api/views/pull_request_api.py b/rhodecode/api/views/pull_request_api.py index 45dbff3b..ee8951f2 100644 --- a/rhodecode/api/views/pull_request_api.py +++ b/rhodecode/api/views/pull_request_api.py @@ -659,9 +659,9 @@ def update_pull_request( commit_changes = {"added": [], "common": [], "removed": []} if str2bool(Optional.extract(update_commits)): if PullRequestModel().has_valid_update_type(pull_request): - _version, _commit_changes = PullRequestModel().update_commits( + update_response = PullRequestModel().update_commits( pull_request) - commit_changes = _commit_changes or commit_changes + commit_changes = update_response.changes or commit_changes Session().commit() reviewers_changes = {"added": [], "removed": []} @@ -687,5 +687,5 @@ def update_pull_request( 'updated_commits': commit_changes, 'updated_reviewers': reviewers_changes } - return data + return data diff --git a/rhodecode/tests/models/test_changeset_status.py b/rhodecode/tests/models/test_changeset_status.py index e09b2b24..fc8ee5db 100644 --- a/rhodecode/tests/models/test_changeset_status.py +++ b/rhodecode/tests/models/test_changeset_status.py @@ -80,7 +80,7 @@ def test_pull_request_stays_if_update_without_change(pr_util, voted_status): voted_status, *pull_request.reviewers) # Update, without change - version, changes = PullRequestModel().update_commits(pull_request) + PullRequestModel().update_commits(pull_request) # Expect that review status is the voted_status expected_review_status = voted_status @@ -99,7 +99,7 @@ def test_pull_request_under_review_if_update(pr_util, voted_status): # Update, with change pr_util.update_source_repository() - version, changes = PullRequestModel().update_commits(pull_request) + PullRequestModel().update_commits(pull_request) # Expect that review status is the voted_status expected_review_status = db.ChangesetStatus.STATUS_UNDER_REVIEW