From 560ebceac42c597574b386b2bdb5f59fcf8a8ea4 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 23 Jul 2016 16:59:41 +0530 Subject: [PATCH] Ignore ECONNRESET when reading from test server --- src/calibre/srv/tests/web_sockets.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/calibre/srv/tests/web_sockets.py b/src/calibre/srv/tests/web_sockets.py index 52c79350ff..7479643164 100644 --- a/src/calibre/srv/tests/web_sockets.py +++ b/src/calibre/srv/tests/web_sockets.py @@ -4,7 +4,7 @@ from __future__ import (unicode_literals, division, absolute_import, print_function) -import socket, os, struct +import socket, os, struct, errno from base64 import standard_b64encode from collections import deque, namedtuple from functools import partial @@ -73,7 +73,12 @@ class WSClient(object): return data self.read_buf.appendleft(data[max_amt+1:]) return data[:max_amt + 1] - return self.socket.recv(max_amt) + try: + return self.socket.recv(max_amt) + except socket.error as err: + if err.errno != errno.ECONNRESET: + raise + return b'' def read_size(self, size): ans = b''