From 73d025a04215a3738867fbe1f8b0ce6557a3ee03 Mon Sep 17 00:00:00 2001 From: Tom Date: Thu, 12 Oct 2017 16:12:18 +0100 Subject: [PATCH] [2.0.x] Refs #28440 -- Fixed server connection closing test on macOS. Backport of 32ade78c55edd6231544607a841a9e7efdcbdb5b from master --- tests/servers/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/servers/tests.py b/tests/servers/tests.py index ea64c246e28..a5667f0b199 100644 --- a/tests/servers/tests.py +++ b/tests/servers/tests.py @@ -75,7 +75,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: