diff options
author | Gustavo Picon <tabo@tabo.pe> | 2014-08-15 23:04:14 -0500 |
---|---|---|
committer | Gustavo Picon <tabo@tabo.pe> | 2014-08-15 23:04:14 -0500 |
commit | cbcab93927dc1f52f03e0133bbc571d01a01c705 (patch) | |
tree | b8f1ca72edceee1b5c8799bdf36366cc4c7b401f | |
parent | 69503758ac1ec9b515f470410e9111fc9099fe53 (diff) | |
download | cherrypy-cbcab93927dc1f52f03e0133bbc571d01a01c705.tar.gz |
Fixed test_queue_full in OS X.
-rw-r--r-- | cherrypy/test/test_conn.py | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/cherrypy/test/test_conn.py b/cherrypy/test/test_conn.py index 00adcca5..502a3ab3 100644 --- a/cherrypy/test/test_conn.py +++ b/cherrypy/test/test_conn.py @@ -1,5 +1,6 @@ """Tests for TCP connection handling, including proper and timely close.""" +import httplib import socket import sys import time @@ -801,6 +802,10 @@ class LimitedRequestQueueTests(helper.CPWebCase): else: raise AssertionError("Overflow conn did not get RST. " "Got %s instead" % repr(exc.args)) + except httplib.BadStatusLine: + # This is a special case in OS X. Linux and Windows will + # RST correctly. + assert sys.platform == 'darwin' else: raise AssertionError("Overflow conn did not get RST ") finally: |