Show More
@@ -357,6 +357,13 b' class TestRepositoryMerge:' | |||
|
357 | 357 | self.target_ref, self.source_repo, self.source_ref, self.workspace, |
|
358 | 358 | dry_run=True) |
|
359 | 359 | |
|
360 | # Multiple merges may differ in their commit id. Therefore we set the | |
|
361 | # commit id to `None` before comparing the merge responses. | |
|
362 | merge_response = merge_response._replace( | |
|
363 | merge_ref=merge_response.merge_ref._replace(commit_id=None)) | |
|
364 | merge_response_update = merge_response_update._replace( | |
|
365 | merge_ref=merge_response_update.merge_ref._replace(commit_id=None)) | |
|
366 | ||
|
360 | 367 | assert merge_response == merge_response_update |
|
361 | 368 | assert merge_response.possible is True |
|
362 | 369 | assert merge_response.executed is False |
General Comments 0
You need to be logged in to leave comments.
Login now