summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
committerRichard van der Hoff <richard@matrix.org>2018-09-27 15:18:21 +0100
commitf094f715cff95a7cebcbd984dbaccf3f1d81615e (patch)
tree0ffd3f4c45b8b50481713e87a226abb7d1cce35e /tests
parentRemove redundant, failing, test (diff)
parentMerge pull request #3794 from matrix-org/erikj/faster_typing (diff)
downloadsynapse-f094f715cff95a7cebcbd984dbaccf3f1d81615e.tar.xz
Merge remote-tracking branch 'origin/develop' into rav/fix_federation_errors
Diffstat (limited to 'tests')
-rw-r--r--tests/unittest.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/unittest.py b/tests/unittest.py
index ef905e6389..043710afaf 100644
--- a/tests/unittest.py
+++ b/tests/unittest.py
@@ -121,7 +121,7 @@ class TestCase(unittest.TestCase):
             try:
                 self.assertEquals(attrs[key], getattr(obj, key))
             except AssertionError as e:
-                raise (type(e))(e.message + " for '.%s'" % key)
+                raise (type(e))(str(e) + " for '.%s'" % key)
 
     def assert_dict(self, required, actual):
         """Does a partial assert of a dict.