Specify IP subnet literals in canonical form (#16953)

This is needed, because the netaddr package removed support for the
implicit prefix form in version 1.0.0:
https://github.com/netaddr/netaddr/pull/360
This commit is contained in:
V02460 2024-03-19 18:19:12 +01:00 committed by GitHub
parent 9635822cc1
commit 05489d89c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 2 deletions

1
changelog.d/16953.misc Normal file
View File

@ -0,0 +1 @@
Specify IP subnets in canonical form.

View File

@ -128,7 +128,7 @@ class AuthTestCase(unittest.HomeserverTestCase):
token="foobar", token="foobar",
url="a_url", url="a_url",
sender=self.test_user, sender=self.test_user,
ip_range_whitelist=IPSet(["192.168/16"]), ip_range_whitelist=IPSet(["192.168.0.0/16"]),
) )
self.store.get_app_service_by_token = Mock(return_value=app_service) self.store.get_app_service_by_token = Mock(return_value=app_service)
self.store.get_user_by_access_token = AsyncMock(return_value=None) self.store.get_user_by_access_token = AsyncMock(return_value=None)
@ -147,7 +147,7 @@ class AuthTestCase(unittest.HomeserverTestCase):
token="foobar", token="foobar",
url="a_url", url="a_url",
sender=self.test_user, sender=self.test_user,
ip_range_whitelist=IPSet(["192.168/16"]), ip_range_whitelist=IPSet(["192.168.0.0/16"]),
) )
self.store.get_app_service_by_token = Mock(return_value=app_service) self.store.get_app_service_by_token = Mock(return_value=app_service)
self.store.get_user_by_access_token = AsyncMock(return_value=None) self.store.get_user_by_access_token = AsyncMock(return_value=None)