Skip to content
Snippets Groups Projects
Verified Commit d575fc54 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

TEST: Testing special attributes merge conflict error msg.

parent 9191afa8
Branches
Tags
2 merge requests!93Release 0.11.0,!81F merge conflict error
Pipeline #30775 passed
...@@ -496,8 +496,11 @@ def test_force_merge(): ...@@ -496,8 +496,11 @@ def test_force_merge():
recB = db.Record() recB = db.Record()
recB.description = "something else" recB.description = "something else"
with pytest.raises(EntityMergeConflictError): with pytest.raises(EntityMergeConflictError) as emce:
merge_entities(recA, recB) merge_entities(recA, recB)
assert str(emce.value) == """Conflict in special attribute description:
A: something
B: something else"""
merge_entities(recA, recB, force=True) merge_entities(recA, recB, force=True)
assert recA.description == "something else" assert recA.description == "something else"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment