TEST: Testing special attributes merge conflict error msg.

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"