mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-12-28 11:14:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

merge heads

Browse Source
This commit is contained in:
Benjamin Peterson 2011-05-23 16:30:29 -05:00
commit bfcdcf9282
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Lib/test/regrtest.py
View File

@ -630,9 +630,11 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
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 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
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 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
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

15
Lib/test/test_logging.py
View File

@ -893,14 +893,29 @@ if threading:
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