diff options
author | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2017-10-24 15:02:25 +0100 |
commit | f009df23ec711e943d958bb0a0e3185d42d7cc79 (patch) | |
tree | 30fa4558fe72f9429b0d533d12653dc786ad9692 /tests/utils.py | |
parent | Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse (diff) | |
parent | Bump version and changelog (diff) | |
download | synapse-f009df23ec711e943d958bb0a0e3185d42d7cc79.tar.xz |
Merge branch 'release-v0.24.1' of github.com:matrix-org/synapse v0.24.1
Diffstat (limited to 'tests/utils.py')
-rw-r--r-- | tests/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/utils.py b/tests/utils.py index 3c81a3e16d..d2ebce4b2e 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -184,7 +184,7 @@ class MockHttpResource(HttpServer): mock_request.args = urlparse.parse_qs(path.split('?')[1]) mock_request.path = path.split('?')[0] path = mock_request.path - except: + except Exception: pass for (method, pattern, func) in self.callbacks: @@ -364,13 +364,13 @@ class MemoryDataStore(object): return { "name": self.tokens_to_users[token], } - except: + except Exception: raise StoreError(400, "User does not exist.") def get_room(self, room_id): try: return self.rooms[room_id] - except: + except Exception: return None def store_room(self, room_id, room_creator_user_id, is_public): @@ -499,7 +499,7 @@ class DeferredMockCallable(object): for _, _, d in self.expectations: try: d.errback(failure) - except: + except Exception: pass raise failure |