summary refs log tree commit diff
path: root/tests/storage
diff options
context:
space:
mode:
authorRichard van der Hoff <1389908+richvdh@users.noreply.github.com>2018-04-20 15:34:49 +0100
committerGitHub <noreply@github.com>2018-04-20 15:34:49 +0100
commit692a3cc8066099dd00593567830390d063a5299b (patch)
treebe03ca6b17cd2f907aba9158619795a91aa4dae6 /tests/storage
parentMerge pull request #3100 from silkeh/readme-srv-cname (diff)
parentUse str(e) instead of e.message (diff)
downloadsynapse-692a3cc8066099dd00593567830390d063a5299b.tar.xz
Merge pull request #3103 from NotAFile/py3-baseexcepton-message
Use str(e) instead of e.message
Diffstat (limited to 'tests/storage')
-rw-r--r--tests/storage/test_appservice.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/storage/test_appservice.py b/tests/storage/test_appservice.py
index c2e39a7288..00825498b1 100644
--- a/tests/storage/test_appservice.py
+++ b/tests/storage/test_appservice.py
@@ -480,9 +480,9 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
             ApplicationServiceStore(None, hs)
 
         e = cm.exception
-        self.assertIn(f1, e.message)
-        self.assertIn(f2, e.message)
-        self.assertIn("id", e.message)
+        self.assertIn(f1, str(e))
+        self.assertIn(f2, str(e))
+        self.assertIn("id", str(e))
 
     @defer.inlineCallbacks
     def test_duplicate_as_tokens(self):
@@ -504,6 +504,6 @@ class ApplicationServiceStoreConfigTestCase(unittest.TestCase):
             ApplicationServiceStore(None, hs)
 
         e = cm.exception
-        self.assertIn(f1, e.message)
-        self.assertIn(f2, e.message)
-        self.assertIn("as_token", e.message)
+        self.assertIn(f1, str(e))
+        self.assertIn(f2, str(e))
+        self.assertIn("as_token", str(e))