Merge branch 'fix-test-workers' of https://github.com/AdamWill/calibre

This commit is contained in:
Kovid Goyal 2020-05-15 07:27:28 +05:30
commit 0217375bcf
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C

View File

@ -93,7 +93,7 @@ class LoopTest(BaseTest):
conn.request('GET', '/') conn.request('GET', '/')
with self.assertRaises(socket.timeout): with self.assertRaises(socket.timeout):
res = conn.getresponse() res = conn.getresponse()
if unicode_type(res.status) == unicode_type(http_client.REQUEST_TIMEOUT): if int(res.status) == int(http_client.REQUEST_TIMEOUT):
raise socket.timeout('Timeout') raise socket.timeout('Timeout')
raise Exception('Got unexpected response: code: %s %s headers: %r data: %r' % ( raise Exception('Got unexpected response: code: %s %s headers: %r data: %r' % (
res.status, res.reason, res.getheaders(), res.read())) res.status, res.reason, res.getheaders(), res.read()))