diff --git a/unittests/test_apiutils.py b/unittests/test_apiutils.py index 155c04ce60da631f5c725be521db0881d6935522..0ba284a1d6a41706f730fb1d4ef23309841d3896 100644 --- a/unittests/test_apiutils.py +++ b/unittests/test_apiutils.py @@ -496,8 +496,11 @@ def test_force_merge(): recB = db.Record() recB.description = "something else" - with pytest.raises(EntityMergeConflictError): + with pytest.raises(EntityMergeConflictError) as emce: merge_entities(recA, recB) + assert str(emce.value) == """Conflict in special attribute description: +A: something +B: something else""" merge_entities(recA, recB, force=True) assert recA.description == "something else"