diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-05-10 07:36:35 (GMT) |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-05-10 07:36:35 (GMT) |
| commit | 809d116fa936f60026cb92010a2506c362adef14 (patch) | |
| tree | 002e30346a0a32eba1da5af7b03174abfcc34ca7 | |
| parent | 6a523489fadfa5002259c0c580c87aa98e87d0ab (diff) | |
| parent | e73afad50fa7c892fd267922223e345ff80e6dd8 (diff) | |
| download | cpython-809d116fa936f60026cb92010a2506c362adef14.zip cpython-809d116fa936f60026cb92010a2506c362adef14.tar.gz cpython-809d116fa936f60026cb92010a2506c362adef14.tar.bz2 | |
merge
| -rw-r--r-- | Lib/test/test_logging.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 07bb46a..1768e8b 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -723,7 +723,14 @@ class TestSMTPServer(smtpd.SMTPServer): :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): """ |