diff options
| author | Tom <tom@tomforb.es> | 2017-10-12 16:12:18 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2017-10-13 13:29:29 -0400 |
| commit | 32ade78c55edd6231544607a841a9e7efdcbdb5b (patch) | |
| tree | eced3848bdb181571e75dd677293af412d837c79 /tests/servers | |
| parent | ad8036d715d4447b95d485332511b4edb1a40c0e (diff) | |
| download | django-32ade78c55edd6231544607a841a9e7efdcbdb5b.tar.gz | |
Refs #28440 -- Fixed server connection closing test on macOS.
Diffstat (limited to 'tests/servers')
| -rw-r--r-- | tests/servers/tests.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/servers/tests.py b/tests/servers/tests.py index cbf477fa98..ce08eb4a3f 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -70,7 +70,8 @@ class LiveServerViews(LiveServerBase): conn.request('GET', '/example_view/', headers={'Connection': 'keep-alive'}) response = conn.getresponse().read() conn.request('GET', '/example_view/', headers={'Connection': 'close'}) - with self.assertRaises(RemoteDisconnected, msg='Server did not close the connection'): + # macOS may give ConnectionResetError. + with self.assertRaises((RemoteDisconnected, ConnectionResetError)): try: conn.getresponse() except ConnectionAbortedError: |