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

tests: Ignore merge commit id on camparison of merge responses.

Browse source
This commit is contained in:
Martin Bornhold 2016-10-25 10:23:38 +02:00
parent 80dde63a91
commit 6bb188f742
1 changed files with 7 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -357,6 +357,13 @@ class TestRepositoryMerge:
self.target_ref, self.source_repo, self.source_ref, self.workspace,
dry_run=True)
# Multiple merges may differ in their commit id. Therefore we set the
# commit id to `None` before comparing the merge responses.
merge_response = merge_response._replace(
merge_ref=merge_response.merge_ref._replace(commit_id=None))
merge_response_update = merge_response_update._replace(
merge_ref=merge_response_update.merge_ref._replace(commit_id=None))
assert merge_response == merge_response_update
assert merge_response.possible is True
assert merge_response.executed is False