Mailman 3 June 2011 - Python-checkins

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: Add missing import (os) to test_kqueue
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/37877d19c2c9 changeset: 71075:37877d19c2c9 parent: 71073:bb7c9308c846 parent: 71074:fdb98a7ef9be user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 17:20:33 2011 +0200 summary: (merge 3.2) Issue #12400: Add missing import (os) to test_kqueue files: Lib/test/test_kqueue.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -1,11 +1,12 @@ """ Tests for kqueue wrapper. """ +import errno +import os +import select import socket -import errno +import sys import time -import select -import sys import unittest from test import support -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12400: Add missing import (os) to test_kqueue
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/fdb98a7ef9be changeset: 71074:fdb98a7ef9be branch: 3.2 parent: 71072:d8ba59de860a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 17:20:02 2011 +0200 summary: Issue #12400: Add missing import (os) to test_kqueue files: Lib/test/test_kqueue.py | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -1,11 +1,12 @@ """ Tests for kqueue wrapper. """ +import errno +import os +import select import socket -import errno +import sys import time -import select -import sys import unittest from test import support -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): Issue #12400: test.support.run_doctest() doesn't change sys.stdout anymore
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/bb7c9308c846 changeset: 71073:bb7c9308c846 parent: 71071:561974b760eb parent: 71072:d8ba59de860a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:53:11 2011 +0200 summary: Issue #12400: test.support.run_doctest() doesn't change sys.stdout anymore regrtest doesn't check that tests doesn't write something to stdout anymore. Don't replace sys.stdout by the original sys.stdout to be able to capture the output for regrtest -W. files: Lib/test/support.py | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1298,16 +1298,9 @@ else: verbosity = None - # Direct doctest output (normally just errors) to real stdout; doctest - # output shouldn't be compared by regrtest. - save_stdout = sys.stdout - sys.stdout = get_original_stdout() - try: - f, t = doctest.testmod(module, verbose=verbosity) - if f: - raise TestFailed("%d of %d doctests failed" % (f, t)) - finally: - sys.stdout = save_stdout + f, t = doctest.testmod(module, verbose=verbosity) + if f: + raise TestFailed("%d of %d doctests failed" % (f, t)) if verbose: print('doctest (%s) ... %d tests with zero failures' % (module.__name__, t)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12400: test.support.run_doctest() doesn't change sys.stdout anymore
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/d8ba59de860a changeset: 71072:d8ba59de860a branch: 3.2 parent: 71070:2d07b1b4466a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:52:46 2011 +0200 summary: Issue #12400: test.support.run_doctest() doesn't change sys.stdout anymore regrtest doesn't check that tests doesn't write something to stdout anymore. Don't replace sys.stdout by the original sys.stdout to be able to capture the output for regrtest -W. files: Lib/test/support.py | 13 +++---------- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Lib/test/support.py b/Lib/test/support.py --- a/Lib/test/support.py +++ b/Lib/test/support.py @@ -1230,16 +1230,9 @@ else: verbosity = None - # Direct doctest output (normally just errors) to real stdout; doctest - # output shouldn't be compared by regrtest. - save_stdout = sys.stdout - sys.stdout = get_original_stdout() - try: - f, t = doctest.testmod(module, verbose=verbosity) - if f: - raise TestFailed("%d of %d doctests failed" % (f, t)) - finally: - sys.stdout = save_stdout + f, t = doctest.testmod(module, verbose=verbosity) + if f: + raise TestFailed("%d of %d doctests failed" % (f, t)) if verbose: print('doctest (%s) ... %d tests with zero failures' % (module.__name__, t)) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: regrtest, force verbose mode to True with option -W
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/561974b760eb changeset: 71071:561974b760eb parent: 71069:8897c755633b parent: 71070:2d07b1b4466a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:38:18 2011 +0200 summary: (merge 3.2) Issue #12400: regrtest, force verbose mode to True with option -W If verbose is False, the output is empty. Fix also a typo in a variable name. files: Lib/test/regrtest.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -838,29 +838,32 @@ if use_timeout: faulthandler.dump_tracebacks_later(timeout, exit=True) try: - support.verbose = verbose # Tell tests to be moderately quiet if output_on_failure: + support.verbose = True + + # Reuse the same instance to all calls to runtest(). Some + # tests keep a reference to sys.stdout or sys.stderr + # (eg. test_argparse). if runtest.stringio is None: - # Reuse the same instance to all calls to runtest(). Some - # tests keep a reference to sys.stdout or sys.stderr - # (eg. test_argparse). runtest.stringio = io.StringIO() + stream = runtest.stringio orig_stdout = sys.stdout orig_stderr = sys.stderr try: - sys.stdout = runtest.stringio - sys.stderr = runtest.stringio + sys.stdout = stream + sys.stderr = stream result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=False) if result[0] == FAILED: - output = stringio.getvalue() + output = stream.getvalue() orig_stderr.write(output) orig_stderr.flush() finally: sys.stdout = orig_stdout sys.stderr = orig_stderr else: + support.verbose = verbose # Tell tests to be moderately quiet result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=not verbose) return result -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12400: regrtest, force verbose mode to True with option -W
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/2d07b1b4466a changeset: 71070:2d07b1b4466a branch: 3.2 parent: 71068:6c54c334ea7a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:34:48 2011 +0200 summary: Issue #12400: regrtest, force verbose mode to True with option -W If verbose is False, the output is empty. Fix also a typo in a variable name. files: Lib/test/regrtest.py | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -784,29 +784,32 @@ if use_resources is not None: support.use_resources = use_resources try: - support.verbose = verbose # Tell tests to be moderately quiet if output_on_failure: + support.verbose = True + + # Reuse the same instance to all calls to runtest(). Some + # tests keep a reference to sys.stdout or sys.stderr + # (eg. test_argparse). if runtest.stringio is None: - # Reuse the same instance to all calls to runtest(). Some - # tests keep a reference to sys.stdout or sys.stderr - # (eg. test_argparse). runtest.stringio = io.StringIO() + stream = runtest.stringio orig_stdout = sys.stdout orig_stderr = sys.stderr try: - sys.stdout = runtest.stringio - sys.stderr = runtest.stringio + sys.stdout = stream + sys.stderr = stream result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=False) if result[0] == FAILED: - output = stringio.getvalue() + output = stream.getvalue() orig_stderr.write(output) orig_stderr.flush() finally: sys.stdout = orig_stdout sys.stderr = orig_stderr else: + support.verbose = verbose # Tell tests to be moderately quiet result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=not verbose) return result -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: runtest() reuses the same io.StringIO instance for
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/8897c755633b changeset: 71069:8897c755633b parent: 71067:c0afc8d00c0a parent: 71068:6c54c334ea7a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:25:40 2011 +0200 summary: (merge 3.2) Issue #12400: runtest() reuses the same io.StringIO instance for all calls * Don't force verbose to True with option -W * Rename rerun_failed variable to output_on_failure files: Lib/test/regrtest.py | 58 ++++++++++++++++++------------- 1 files changed, 34 insertions(+), 24 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -162,23 +162,24 @@ """ import builtins +import errno import faulthandler import getopt +import io import json +import logging import os +import platform import random import re import sys +import sysconfig +import tempfile import time -import errno import traceback +import unittest import warnings -import unittest from inspect import isabstract -import tempfile -import platform -import sysconfig -import logging # Some times __path__ and __file__ are not absolute (e.g. while running from @@ -579,7 +580,8 @@ args_tuple = ( (test, verbose, quiet), dict(huntrleaks=huntrleaks, use_resources=use_resources, - debug=debug, rerun_failed=verbose3, timeout=timeout) + debug=debug, output_on_failure=verbose3, + timeout=timeout) ) yield (test, args_tuple) pending = tests_and_args() @@ -664,7 +666,7 @@ else: try: result = runtest(test, verbose, quiet, huntrleaks, debug, - rerun_failed=verbose3, timeout=timeout) + output_on_failure=verbose3, timeout=timeout) accumulate_result(test, result) except KeyboardInterrupt: interrupted = True @@ -808,7 +810,7 @@ def runtest(test, verbose, quiet, huntrleaks=False, debug=False, use_resources=None, - rerun_failed=False, timeout=None): + output_on_failure=False, timeout=None): """Run a single test. test -- the name of the test @@ -817,7 +819,7 @@ test_times -- a list of (time, test_name) pairs huntrleaks -- run multiple times to test for leaks; requires a debug build; a triple corresponding to -R's three arguments - rerun_failed -- if true, re-run in verbose mode when failed + output_on_failure -- if true, display test output on failure timeout -- dump the traceback and exit if a test takes more than timeout seconds @@ -836,22 +838,29 @@ if use_timeout: faulthandler.dump_tracebacks_later(timeout, exit=True) try: - if rerun_failed: - support.verbose = True + support.verbose = verbose # Tell tests to be moderately quiet + if output_on_failure: + if runtest.stringio is None: + # Reuse the same instance to all calls to runtest(). Some + # tests keep a reference to sys.stdout or sys.stderr + # (eg. test_argparse). + runtest.stringio = io.StringIO() + + orig_stdout = sys.stdout orig_stderr = sys.stderr - with support.captured_stdout() as stream: - try: - sys.stderr = stream - result = runtest_inner(test, verbose, quiet, huntrleaks, - debug, display_failure=False) - if result[0] == FAILED: - output = stream.getvalue() - orig_stderr.write(output) - orig_stderr.flush() - finally: - sys.stderr = orig_stderr + try: + sys.stdout = runtest.stringio + sys.stderr = runtest.stringio + result = runtest_inner(test, verbose, quiet, huntrleaks, + debug, display_failure=False) + if result[0] == FAILED: + output = stringio.getvalue() + orig_stderr.write(output) + orig_stderr.flush() + finally: + sys.stdout = orig_stdout + sys.stderr = orig_stderr else: - support.verbose = verbose # Tell tests to be moderately quiet result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=not verbose) return result @@ -859,6 +868,7 @@ if use_timeout: faulthandler.cancel_dump_tracebacks_later() cleanup_test_droppings(test, verbose) +runtest.stringio = None # Unit tests are supposed to leave the execution environment unchanged # once they complete. But sometimes tests have bugs, especially when -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12400: runtest() reuses the same io.StringIO instance for all calls
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/6c54c334ea7a changeset: 71068:6c54c334ea7a branch: 3.2 parent: 71066:74c6afbb524a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 15:22:26 2011 +0200 summary: Issue #12400: runtest() reuses the same io.StringIO instance for all calls * Don't force verbose to True with option -W * Rename rerun_failed variable to output_on_failure files: Lib/test/regrtest.py | 57 ++++++++++++++++++------------- 1 files changed, 33 insertions(+), 24 deletions(-) diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py --- a/Lib/test/regrtest.py +++ b/Lib/test/regrtest.py @@ -154,22 +154,23 @@ """ import builtins +import errno import getopt +import io import json +import logging import os +import platform import random import re import sys +import sysconfig +import tempfile import time -import errno import traceback +import unittest import warnings -import unittest from inspect import isabstract -import tempfile -import platform -import sysconfig -import logging # Some times __path__ and __file__ are not absolute (e.g. while running from @@ -535,7 +536,7 @@ args_tuple = ( (test, verbose, quiet), dict(huntrleaks=huntrleaks, use_resources=use_resources, - debug=debug, rerun_failed=verbose3) + debug=debug, output_on_failure=verbose3) ) yield (test, args_tuple) pending = tests_and_args() @@ -613,7 +614,7 @@ else: try: result = runtest(test, verbose, quiet, huntrleaks, debug, - rerun_failed=verbose3) + output_on_failure=verbose3) accumulate_result(test, result) except KeyboardInterrupt: interrupted = True @@ -760,7 +761,7 @@ def runtest(test, verbose, quiet, huntrleaks=False, debug=False, use_resources=None, - rerun_failed=False): + output_on_failure=False): """Run a single test. test -- the name of the test @@ -769,7 +770,7 @@ test_times -- a list of (time, test_name) pairs huntrleaks -- run multiple times to test for leaks; requires a debug build; a triple corresponding to -R's three arguments - rerun_failed -- if true, re-run in verbose mode when failed + output_on_failure -- if true, display test output on failure Returns one of the test result constants: INTERRUPTED KeyboardInterrupt when run under -j @@ -783,27 +784,35 @@ if use_resources is not None: support.use_resources = use_resources try: - if rerun_failed: - support.verbose = True + support.verbose = verbose # Tell tests to be moderately quiet + if output_on_failure: + if runtest.stringio is None: + # Reuse the same instance to all calls to runtest(). Some + # tests keep a reference to sys.stdout or sys.stderr + # (eg. test_argparse). + runtest.stringio = io.StringIO() + + orig_stdout = sys.stdout orig_stderr = sys.stderr - with support.captured_stdout() as stream: - try: - sys.stderr = stream - result = runtest_inner(test, verbose, quiet, huntrleaks, - debug, display_failure=False) - if result[0] == FAILED: - output = stream.getvalue() - orig_stderr.write(output) - orig_stderr.flush() - finally: - sys.stderr = orig_stderr + try: + sys.stdout = runtest.stringio + sys.stderr = runtest.stringio + result = runtest_inner(test, verbose, quiet, huntrleaks, + debug, display_failure=False) + if result[0] == FAILED: + output = stringio.getvalue() + orig_stderr.write(output) + orig_stderr.flush() + finally: + sys.stdout = orig_stdout + sys.stderr = orig_stderr else: - support.verbose = verbose # Tell tests to be moderately quiet result = runtest_inner(test, verbose, quiet, huntrleaks, debug, display_failure=not verbose) return result finally: cleanup_test_droppings(test, verbose) +runtest.stringio = None # Unit tests are supposed to leave the execution environment unchanged # once they complete. But sometimes tests have bugs, especially when -- Repository URL: http://hg.python.org/cpython

1 0

cpython (3.2): Issue #12400: don't use sys.stderr in test_kqueue because it may be replaced by
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/74c6afbb524a changeset: 71066:74c6afbb524a branch: 3.2 parent: 71063:69e102bfed2b user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 14:59:10 2011 +0200 summary: Issue #12400: don't use sys.stderr in test_kqueue because it may be replaced by a io.StringIO object by regrtest (which has no file descriptor). files: Lib/test/test_kqueue.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -23,7 +23,10 @@ def test_create_event(self): from operator import lt, le, gt, ge - fd = sys.stderr.fileno() + + fd = os.open(os.devnull, os.O_WRONLY) + self.addCleanup(os.close, fd) + ev = select.kevent(fd) other = select.kevent(1000) self.assertEqual(ev.ident, fd) -- Repository URL: http://hg.python.org/cpython

1 0

cpython (merge 3.2 -> default): (merge 3.2) Issue #12400: don't use sys.stderr in test_kqueue because it may be
by victor.stinner June 29, 2011

June 29, 2011

http://hg.python.org/cpython/rev/c0afc8d00c0a changeset: 71067:c0afc8d00c0a parent: 71065:80c7d63325f6 parent: 71066:74c6afbb524a user: Victor Stinner <victor.stinner(a)haypocalc.com> date: Wed Jun 29 14:59:46 2011 +0200 summary: (merge 3.2) Issue #12400: don't use sys.stderr in test_kqueue because it may be replaced by a io.StringIO object by regrtest (which has no file descriptor). files: Lib/test/test_kqueue.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_kqueue.py b/Lib/test/test_kqueue.py --- a/Lib/test/test_kqueue.py +++ b/Lib/test/test_kqueue.py @@ -23,7 +23,10 @@ def test_create_event(self): from operator import lt, le, gt, ge - fd = sys.stderr.fileno() + + fd = os.open(os.devnull, os.O_WRONLY) + self.addCleanup(os.close, fd) + ev = select.kevent(fd) other = select.kevent(1000) self.assertEqual(ev.ident, fd) -- Repository URL: http://hg.python.org/cpython

1 0