[Python-checkins] cpython (merge default -> default): merge heads

Mon May 23 23:32:17 CEST 2011

http://hg.python.org/cpython/rev/d7028f9b99e0
changeset: 70316:d7028f9b99e0
parent: 70314:9ad35fb92e07
parent: 70310:60b0131fbea8
user: Benjamin Peterson <benjamin at python.org>
date: Mon May 23 16:30:29 2011 -0500
summary:
 merge heads
files:
 Lib/test/regrtest.py | 11 ++++++-----
 Lib/test/test_logging.py | 15 +++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -630,9 +630,11 @@
 if test is None:
 finished += 1
 continue
+ accumulate_result(test, result)
 if not quiet:
- print("[{1:{0}}{2}] {3}".format(
- test_count_width, test_index, test_count, test))
+ print("[{1:{0}}{2}/{3}] {4}".format(
+ test_count_width, test_index, test_count,
+ len(bad), test))
 if stdout:
 print(stdout)
 if stderr:
@@ -642,7 +644,6 @@
 raise KeyboardInterrupt # What else?
 if result[0] == CHILD_ERROR:
 raise Exception("Child error on {}: {}".format(test, result[1]))
- accumulate_result(test, result)
 test_index += 1
 except KeyboardInterrupt:
 interrupted = True
@@ -652,8 +653,8 @@
 else:
 for test_index, test in enumerate(tests, 1):
 if not quiet:
- print("[{1:{0}}{2}] {3}".format(
- test_count_width, test_index, test_count, test))
+ print("[{1:{0}}{2}/{3}] {4}".format(
+ test_count_width, test_index, test_count, len(bad), test))
 sys.stdout.flush()
 if trace:
 # If we're tracing code coverage, then we don't exit with status
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py
--- a/Lib/test/test_logging.py
+++ b/Lib/test/test_logging.py
@@ -893,14 +893,29 @@
 
 def handle(self):
 self.server._handler(self)
+
+ def finish(self):
+ data = self.wfile.getvalue()
+ try:
+ super(DelegatingUDPRequestHandler, self).finish()
+ except socket.error:
+ msg = ('Error during finish, while sending %r, '
+ 'closed = %s')
+ print(msg % (data, self.server._closed), file=sys.stderr)
+ raise
+
 ThreadingUDPServer.__init__(self, addr, DelegatingUDPRequestHandler,
 bind_and_activate)
 ControlMixin.__init__(self, handler, poll_interval)
+ self._closed = False
 
 def server_bind(self):
 super(TestUDPServer, self).server_bind()
 self.port = self.socket.getsockname()[1]
 
+ def server_close(self):
+ super(TestUDPServer, self).server_close()
+ self._closed = True
 
 # - end of server_helper section
 
-- 
Repository URL: http://hg.python.org/cpython
