mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-18 17:10:43 +03:00
Code Issues Projects Releases Packages Wiki Activity

Update tests

Browse source
This commit is contained in:
Andrew Morgan 2019-05-08 15:42:35 -07:00
parent aee810a548
commit a30a778e6c
1 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
tests/rest/media/v1/test_url_preview.py
View file

@ -297,12 +297,12 @@ class URLPreviewTests(unittest.HomeserverTestCase):
# No requests made. # No requests made.
self.assertEqual(len(self.reactor.tcpClients), 0) self.assertEqual(len(self.reactor.tcpClients), 0)
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 502)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'DNS resolution failure during URL preview generation',
}, },
) )
@ -318,12 +318,12 @@ class URLPreviewTests(unittest.HomeserverTestCase):
request.render(self.preview_url) request.render(self.preview_url)
self.pump() self.pump()
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 502)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'DNS resolution failure during URL preview generation',
}, },
) )
@ -343,10 +343,10 @@ class URLPreviewTests(unittest.HomeserverTestCase):
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'IP address blocked by IP blacklist entry',
}, },
) )
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 403)
def test_blacklisted_ip_range_direct(self): def test_blacklisted_ip_range_direct(self):
""" """
@ -358,12 +358,12 @@ class URLPreviewTests(unittest.HomeserverTestCase):
request.render(self.preview_url) request.render(self.preview_url)
self.pump() self.pump()
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 403)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'IP address blocked by IP blacklist entry',
}, },
) )
@ -414,12 +414,12 @@ class URLPreviewTests(unittest.HomeserverTestCase):
) )
request.render(self.preview_url) request.render(self.preview_url)
self.pump() self.pump()
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 502)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'DNS resolution failure during URL preview generation',
}, },
) )
@ -439,12 +439,12 @@ class URLPreviewTests(unittest.HomeserverTestCase):
# No requests made. # No requests made.
self.assertEqual(len(self.reactor.tcpClients), 0) self.assertEqual(len(self.reactor.tcpClients), 0)
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 502)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'DNS resolution failure during URL preview generation',
}, },
) )
@ -460,11 +460,11 @@ class URLPreviewTests(unittest.HomeserverTestCase):
request.render(self.preview_url) request.render(self.preview_url)
self.pump() self.pump()
self.assertEqual(channel.code, 404) self.assertEqual(channel.code, 502)
self.assertEqual( self.assertEqual(
channel.json_body, channel.json_body,
{ {
'errcode': 'M_UNKNOWN', 'errcode': 'M_UNKNOWN',
'error': 'No results found', 'error': 'DNS resolution failure during URL preview generation',
}, },
) )