(original) (raw)

changeset: 70002:b365036b17c2 parent: 70000:0b8c7cf25d10 user: Vinay Sajip <vinay_sajip@yahoo.co.uk> date: Tue May 10 07:48:28 2011 +0100 files: Lib/test/test_logging.py description: Issue #12039: Now suppress spurious select.error raised on FreeBSD when the server (an asyncore.dispatcher) is closed. diff -r 0b8c7cf25d10 -r b365036b17c2 Lib/test/test_logging.py --- a/Lib/test/test_logging.py Tue May 10 01:30:03 2011 +0200 +++ b/Lib/test/test_logging.py Tue May 10 07:48:28 2011 +0100 @@ -723,7 +723,14 @@ :func:`select` or :func:`poll` call by :func:`asyncore.loop`. """ - asyncore.loop(poll_interval, map=self.sockmap) + try: + asyncore.loop(poll_interval, map=self.sockmap) + except select.error: + # On FreeBSD 8, closing the server repeatably + # raises this error. We swallow it if the + # server has been closed. + if self.connected or self.accepting: + raise def stop(self, timeout=None): """ </vinay_sajip@yahoo.co.uk>