diff options
author | dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> | 2022-10-19 19:38:24 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-19 19:38:24 +0000 |
commit | 0b7830e457359ce651b293c8748bf636973404a9 (patch) | |
tree | d8a0099884513c09518168df7e7ad56f5942f5a1 /tests | |
parent | Document encryption_enabled_by_default_for_room_type under the right name (#1... (diff) | |
download | synapse-0b7830e457359ce651b293c8748bf636973404a9.tar.xz |
Bump flake8-bugbear from 21.3.2 to 22.9.23 (#14042)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Erik Johnston <erik@matrix.org> Co-authored-by: David Robertson <davidr@element.io>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/federation/transport/test_client.py | 7 | ||||
-rw-r--r-- | tests/util/caches/test_descriptors.py | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/tests/federation/transport/test_client.py b/tests/federation/transport/test_client.py index 0926e0583d..dd4d1b56de 100644 --- a/tests/federation/transport/test_client.py +++ b/tests/federation/transport/test_client.py @@ -17,6 +17,7 @@ from unittest.mock import Mock from synapse.api.room_versions import RoomVersions from synapse.federation.transport.client import SendJoinParser +from synapse.util import ExceptionBundle from tests.unittest import TestCase @@ -121,10 +122,8 @@ class SendJoinParserTestCase(TestCase): # Send half of the data to the parser parser.write(serialisation[: len(serialisation) // 2]) - # Close the parser. There should be _some_ kind of exception, but it need not - # be that RuntimeError directly. E.g. we might want to raise a wrapper - # encompassing multiple errors from multiple coroutines. - with self.assertRaises(Exception): + # Close the parser. There should be _some_ kind of exception. + with self.assertRaises(ExceptionBundle): parser.finish() # In any case, we should have tried to close both coros. diff --git a/tests/util/caches/test_descriptors.py b/tests/util/caches/test_descriptors.py index 90861fe522..78fd7b6961 100644 --- a/tests/util/caches/test_descriptors.py +++ b/tests/util/caches/test_descriptors.py @@ -1037,5 +1037,5 @@ class CachedListDescriptorTestCase(unittest.TestCase): obj = Cls() # Make sure this raises an error about the arg mismatch - with self.assertRaises(Exception): + with self.assertRaises(TypeError): obj.list_fn([("foo", "bar")]) |