summaryrefslogtreecommitdiff
path: root/tests/requests
diff options
context:
space:
mode:
authorHasan <hasan.r67@gmail.com>2016-01-04 12:20:08 +0330
committerTim Graham <timograham@gmail.com>2016-01-29 13:03:39 -0500
commit253adc2b8a52982139d40c4f55b3fd446e1cb8f3 (patch)
treec508d48636f5b37e97c8078737d398d7475ff8cc /tests/requests
parent3d0dcd7f5af378d3ab6adb303b913e6c7b2e0ee5 (diff)
Refs #26022 -- Used context manager version of assertRaisesMessage in tests.
Diffstat (limited to 'tests/requests')
-rw-r--r--tests/requests/tests.py28
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/requests/tests.py b/tests/requests/tests.py
index 280320ae43..8113cb7685 100644
--- a/tests/requests/tests.py
+++ b/tests/requests/tests.py
@@ -772,11 +772,8 @@ class HostValidationTests(SimpleTestCase):
]:
request = HttpRequest()
request.META = {'HTTP_HOST': host}
- self.assertRaisesMessage(
- SuspiciousOperation,
- msg_suggestion % (host, host),
- request.get_host
- )
+ with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion % (host, host)):
+ request.get_host()
for domain, port in [ # Valid-looking hosts with a port number
('example.com', 80),
@@ -786,28 +783,19 @@ class HostValidationTests(SimpleTestCase):
host = '%s:%s' % (domain, port)
request = HttpRequest()
request.META = {'HTTP_HOST': host}
- self.assertRaisesMessage(
- SuspiciousOperation,
- msg_suggestion % (host, domain),
- request.get_host
- )
+ with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion % (host, domain)):
+ request.get_host()
for host in self.poisoned_hosts:
request = HttpRequest()
request.META = {'HTTP_HOST': host}
- self.assertRaisesMessage(
- SuspiciousOperation,
- msg_invalid_host % host,
- request.get_host
- )
+ with self.assertRaisesMessage(SuspiciousOperation, msg_invalid_host % host):
+ request.get_host()
request = HttpRequest()
request.META = {'HTTP_HOST': "invalid_hostname.com"}
- self.assertRaisesMessage(
- SuspiciousOperation,
- msg_suggestion2 % "invalid_hostname.com",
- request.get_host
- )
+ with self.assertRaisesMessage(SuspiciousOperation, msg_suggestion2 % "invalid_hostname.com"):
+ request.get_host()
class BuildAbsoluteURITestCase(SimpleTestCase):