Mailman 3 March 2016 - Python-checkins

cpython: Issue #26295: Enhanc test_regrtest.test_tools_script_run_tests()
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/e47e00723e5d changeset: 100797:e47e00723e5d user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 08:51:15 2016 +0200 summary: Issue #26295: Enhanc test_regrtest.test_tools_script_run_tests() Pass all regrtest options, not only --testdir. files: Lib/test/test_regrtest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -514,7 +514,7 @@ def test_tools_script_run_tests(self): # Tools/scripts/run_tests.py script = os.path.join(ROOT_DIR, 'Tools', 'scripts', 'run_tests.py') - args = [script, '--testdir=%s' % self.tmptestdir, *self.tests] + args = [script, *self.regrtest_args, *self.tests] self.run_tests(args) def run_batch(self, *args): -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #26295: Fix test_regrtest.test_tools_buildbot_test()
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/e29f12ed4444 changeset: 100796:e29f12ed4444 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 08:38:05 2016 +0200 summary: Issue #26295: Fix test_regrtest.test_tools_buildbot_test() Pass also --testdir option. files: Lib/test/test_regrtest.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -527,7 +527,7 @@ def test_tools_buildbot_test(self): # Tools\buildbot\test.bat script = os.path.join(ROOT_DIR, 'Tools', 'buildbot', 'test.bat') - test_args = [] + test_args = ['--testdir=%s' % self.tmptestdir] if platform.architecture()[0] == '64bit': test_args.append('-x64') # 64-bit build if not Py_DEBUG: -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #26295: test_regrtest now uses a temporary directory
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/c83349c129c9 changeset: 100795:c83349c129c9 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 02:33:52 2016 +0200 summary: Issue #26295: test_regrtest now uses a temporary directory test_forever() stores its state into the builtins module since the test module is reloaded at each run. Remove also warning to detect leaked tests of a previous run. files: Lib/test/test_regrtest.py | 55 +++++++++++++------------- 1 files changed, 28 insertions(+), 27 deletions(-) diff --git a/Lib/test/test_regrtest.py b/Lib/test/test_regrtest.py --- a/Lib/test/test_regrtest.py +++ b/Lib/test/test_regrtest.py @@ -15,6 +15,7 @@ import subprocess import sys import sysconfig +import tempfile import textwrap import unittest from test import libregrtest @@ -309,15 +310,8 @@ def setUp(self): self.testdir = os.path.realpath(os.path.dirname(__file__)) - # When test_regrtest is interrupted by CTRL+c, it can leave - # temporary test files - remove = [entry.path - for entry in os.scandir(self.testdir) - if (entry.name.startswith(self.TESTNAME_PREFIX) - and entry.name.endswith(".py"))] - for path in remove: - print("WARNING: test_regrtest: remove %s" % path) - support.unlink(path) + self.tmptestdir = tempfile.mkdtemp() + self.addCleanup(support.rmtree, self.tmptestdir) def create_test(self, name=None, code=''): if not name: @@ -326,8 +320,8 @@ # test_regrtest cannot be run twice in parallel because # of setUp() and create_test() - name = self.TESTNAME_PREFIX + "%s_%s" % (os.getpid(), name) - path = os.path.join(self.testdir, name + '.py') + name = self.TESTNAME_PREFIX + name + path = os.path.join(self.tmptestdir, name + '.py') self.addCleanup(support.unlink, path) # Use 'x' mode to ensure that we do not override existing tests @@ -462,7 +456,8 @@ self.tests = [self.create_test() for index in range(self.NTEST)] self.python_args = ['-Wd', '-E', '-bb'] - self.regrtest_args = ['-uall', '-rwW'] + self.regrtest_args = ['-uall', '-rwW', + '--testdir=%s' % self.tmptestdir] if hasattr(faulthandler, 'dump_traceback_later'): self.regrtest_args.extend(('--timeout', '3600', '-j4')) if sys.platform == 'win32': @@ -519,7 +514,8 @@ def test_tools_script_run_tests(self): # Tools/scripts/run_tests.py script = os.path.join(ROOT_DIR, 'Tools', 'scripts', 'run_tests.py') - self.run_tests([script, *self.tests]) + args = [script, '--testdir=%s' % self.tmptestdir, *self.tests] + self.run_tests(args) def run_batch(self, *args): proc = self.run_command(args) @@ -555,8 +551,9 @@ Test arguments of the Python test suite. """ - def run_tests(self, *args, **kw): - return self.run_python(['-m', 'test', *args], **kw) + def run_tests(self, *testargs, **kw): + cmdargs = ['-m', 'test', '--testdir=%s' % self.tmptestdir, *testargs] + return self.run_python(cmdargs, **kw) def test_failing_test(self): # test a failing test @@ -567,8 +564,8 @@ def test_failing(self): self.fail("bug") """) - test_ok = self.create_test() - test_failing = self.create_test(code=code) + test_ok = self.create_test('ok') + test_failing = self.create_test('failing', code=code) tests = [test_ok, test_failing] output = self.run_tests(*tests, exitcode=1) @@ -661,7 +658,7 @@ def test_interrupted(self): code = TEST_INTERRUPTED - test = self.create_test("sigint", code=code) + test = self.create_test('sigint', code=code) output = self.run_tests(test, exitcode=1) self.check_executed_tests(output, test, omitted=test) @@ -693,7 +690,7 @@ def test_coverage(self): # test --coverage - test = self.create_test() + test = self.create_test('coverage') output = self.run_tests("--coverage", test) self.check_executed_tests(output, [test]) regex = ('lines +cov% +module +\(path\)\n' @@ -702,24 +699,28 @@ def test_wait(self): # test --wait - test = self.create_test() + test = self.create_test('wait') output = self.run_tests("--wait", test, input='key') self.check_line(output, 'Press any key to continue') def test_forever(self): # test --forever code = textwrap.dedent(""" + import builtins import unittest class ForeverTester(unittest.TestCase): - RUN = 1 - def test_run(self): - ForeverTester.RUN += 1 - if ForeverTester.RUN > 3: - self.fail("fail at the 3rd runs") + # Store the state in the builtins module, because the test + # module is reload at each run + if 'RUN' in builtins.__dict__: + builtins.__dict__['RUN'] += 1 + if builtins.__dict__['RUN'] >= 3: + self.fail("fail at the 3rd runs") + else: + builtins.__dict__['RUN'] = 1 """) - test = self.create_test(code=code) + test = self.create_test('forever', code=code) output = self.run_tests('--forever', test, exitcode=1) self.check_executed_tests(output, [test]*3, failed=test) @@ -747,7 +748,7 @@ fd = os.open(__file__, os.O_RDONLY) # bug: never cloes the file descriptor """) - test = self.create_test(code=code) + test = self.create_test('huntrleaks', code=code) filename = 'reflog.txt' self.addCleanup(support.unlink, filename) -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Issue #26295: When using "python3 -m test --testdir=TESTDIR", regrtest doesn't
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/f7ddd72b70ea changeset: 100794:f7ddd72b70ea user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 02:32:52 2016 +0200 summary: Issue #26295: When using "python3 -m test --testdir=TESTDIR", regrtest doesn't add "test." prefix to test module names. regrtest also prepends testdir to sys.path. files: Lib/test/libregrtest/runtest.py | 8 ++++---- Lib/test/libregrtest/setup.py | 5 +++++ Misc/NEWS | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Lib/test/libregrtest/runtest.py b/Lib/test/libregrtest/runtest.py --- a/Lib/test/libregrtest/runtest.py +++ b/Lib/test/libregrtest/runtest.py @@ -116,7 +116,7 @@ try: sys.stdout = stream sys.stderr = stream - result = runtest_inner(test, verbose, quiet, huntrleaks, + result = runtest_inner(ns, test, verbose, quiet, huntrleaks, display_failure=False, pgo=pgo) if result[0] == FAILED: output = stream.getvalue() @@ -127,7 +127,7 @@ sys.stderr = orig_stderr else: support.verbose = verbose # Tell tests to be moderately quiet - result = runtest_inner(test, verbose, quiet, huntrleaks, + result = runtest_inner(ns, test, verbose, quiet, huntrleaks, display_failure=not verbose, pgo=pgo) return result finally: @@ -137,14 +137,14 @@ runtest.stringio = None -def runtest_inner(test, verbose, quiet, +def runtest_inner(ns, test, verbose, quiet, huntrleaks=False, display_failure=True, *, pgo=False): support.unload(test) test_time = 0.0 refleak = False # True if the test leaked references. try: - if test.startswith('test.'): + if test.startswith('test.') or ns.testdir: abstest = test else: # Always import it from the test package diff --git a/Lib/test/libregrtest/setup.py b/Lib/test/libregrtest/setup.py --- a/Lib/test/libregrtest/setup.py +++ b/Lib/test/libregrtest/setup.py @@ -29,6 +29,11 @@ replace_stdout() support.record_original_stdout(sys.stdout) + if ns.testdir: + # Prepend test directory to sys.path, so runtest() will be able + # to locate tests + sys.path.insert(0, os.path.abspath(ns.testdir)) + # Some times __path__ and __file__ are not absolute (e.g. while running from # Lib/) and, if we change the CWD to run the tests in a temporary dir, some # imports might fail. This affects only the modules imported before os.chdir(). diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -879,6 +879,9 @@ Tests ----- +- Issue #26295: When using "python3 -m test --testdir=TESTDIR", regrtest + doesn't add "test." prefix to test module names. + - Issue #26523: The multiprocessing thread pool (multiprocessing.dummy.Pool) was untested. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5 (test_urllibnet)
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/9428e12d4370 changeset: 100793:9428e12d4370 parent: 100791:32539353eb95 parent: 100792:7bd4736195ce user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 02:20:34 2016 +0200 summary: Merge 3.5 (test_urllibnet) files: Lib/test/test_urllibnet.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -104,7 +104,7 @@ @unittest.skipIf(sys.platform in ('win32',), 'not appropriate for Windows') def test_fileno(self): # Make sure fd returned by fileno is valid. - with self.urlopen("http://www.google.com/", timeout=None) as open_url: + with self.urlopen("http://www.google.com/") as open_url: fd = open_url.fileno() with os.fdopen(fd, 'rb') as f: self.assertTrue(f.read(), "reading from file created using fd " -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): test_urllibnet: set timeout on test_fileno()
by victor.stinner March 30, 2016

March 30, 2016

https://hg.python.org/cpython/rev/7bd4736195ce changeset: 100792:7bd4736195ce branch: 3.5 parent: 100789:f75d78a59601 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 02:19:01 2016 +0200 summary: test_urllibnet: set timeout on test_fileno() Use the default timeout of 30 seconds to avoid blocking forever. files: Lib/test/test_urllibnet.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py --- a/Lib/test/test_urllibnet.py +++ b/Lib/test/test_urllibnet.py @@ -104,7 +104,7 @@ @unittest.skipIf(sys.platform in ('win32',), 'not appropriate for Windows') def test_fileno(self): # Make sure fd returned by fileno is valid. - with self.urlopen("http://www.google.com/", timeout=None) as open_url: + with self.urlopen("http://www.google.com/") as open_url: fd = open_url.fileno() with os.fdopen(fd, 'rb') as f: self.assertTrue(f.read(), "reading from file created using fd " -- Repository URL: https://hg.python.org/cpython

1 0

cpython: doctest now supports packages
by victor.stinner March 29, 2016

March 29, 2016

https://hg.python.org/cpython/rev/32539353eb95 changeset: 100791:32539353eb95 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 01:29:05 2016 +0200 summary: doctest now supports packages Issue #26641: doctest.DocFileTest and doctest.testfile() now support packages (module splitted into multiple directories) for the package parameter. files: Lib/doctest.py | 17 +++++++++++++---- Misc/NEWS | 4 ++++ 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Lib/doctest.py b/Lib/doctest.py --- a/Lib/doctest.py +++ b/Lib/doctest.py @@ -381,12 +381,15 @@ sys.stdout = save_stdout # [XX] Normalize with respect to os.path.pardir? -def _module_relative_path(module, path): +def _module_relative_path(module, test_path): if not inspect.ismodule(module): raise TypeError('Expected a module: %r' % module) - if path.startswith('/'): + if test_path.startswith('/'): raise ValueError('Module-relative files may not have absolute paths') + # Normalize the path. On Windows, replace "/" with "\". + test_path = os.path.join(*(test_path.split('/'))) + # Find the base directory for the path. if hasattr(module, '__file__'): # A normal module/package @@ -398,13 +401,19 @@ else: basedir = os.curdir else: + if hasattr(module, '__path__'): + for directory in module.__path__: + fullpath = os.path.join(directory, test_path) + if os.path.exists(fullpath): + return fullpath + # A module w/o __file__ (this includes builtins) raise ValueError("Can't resolve paths relative to the module " "%r (it has no __file__)" % module.__name__) - # Combine the base directory and the path. - return os.path.join(basedir, *(path.split('/'))) + # Combine the base directory and the test path. + return os.path.join(basedir, test_path) ###################################################################### ## 2. Example & DocTest diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -232,6 +232,10 @@ Library ------- +- Issue #26641: doctest.DocFileTest and doctest.testfile() now support + packages (module splitted into multiple directories) for the package + parameter. + - Issue #25195: Fix a regression in mock.MagicMock. _Call is a subclass of tuple (changeset 3603bae63c13 only works for classes) so we need to implement __ne__ ourselves. Patch by Andrew Plummer. -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Fix ResourceWarning in test_unittest when interrupted
by victor.stinner March 29, 2016

March 29, 2016

https://hg.python.org/cpython/rev/f75d78a59601 changeset: 100789:f75d78a59601 branch: 3.5 parent: 100787:c38ac7ab8d9a user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 01:15:28 2016 +0200 summary: Fix ResourceWarning in test_unittest when interrupted files: Lib/unittest/test/test_runner.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py --- a/Lib/unittest/test/test_runner.py +++ b/Lib/unittest/test/test_runner.py @@ -290,7 +290,8 @@ # no args -> all the warnings are printed, unittest warnings only once p = subprocess.Popen([sys.executable, '_test_warnings.py'], **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) # check that the total number of warnings in the output is correct self.assertEqual(len(out), 12) @@ -311,7 +312,8 @@ # in all these cases no warnings are printed for args in args_list: p = subprocess.Popen(args, **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) self.assertEqual(len(out), 0) @@ -320,7 +322,8 @@ # unittest warnings only once p = subprocess.Popen([sys.executable, '_test_warnings.py', 'always'], **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) self.assertEqual(len(out), 14) for msg in [b'dw', b'iw', b'uw', b'rw']: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Merge 3.5 (test_unittest)
by victor.stinner March 29, 2016

March 29, 2016

https://hg.python.org/cpython/rev/575741001a3b changeset: 100790:575741001a3b parent: 100788:688c6b16228e parent: 100789:f75d78a59601 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Mar 30 01:15:48 2016 +0200 summary: Merge 3.5 (test_unittest) files: Lib/unittest/test/test_runner.py | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py --- a/Lib/unittest/test/test_runner.py +++ b/Lib/unittest/test/test_runner.py @@ -290,7 +290,8 @@ # no args -> all the warnings are printed, unittest warnings only once p = subprocess.Popen([sys.executable, '_test_warnings.py'], **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) # check that the total number of warnings in the output is correct self.assertEqual(len(out), 12) @@ -311,7 +312,8 @@ # in all these cases no warnings are printed for args in args_list: p = subprocess.Popen(args, **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) self.assertEqual(len(out), 0) @@ -320,7 +322,8 @@ # unittest warnings only once p = subprocess.Popen([sys.executable, '_test_warnings.py', 'always'], **opts) - out, err = get_parse_out_err(p) + with p: + out, err = get_parse_out_err(p) self.assertIn(b'OK', err) self.assertEqual(len(out), 14) for msg in [b'dw', b'iw', b'uw', b'rw']: -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> default): Null merge 3.5
by victor.stinner March 29, 2016

March 29, 2016

https://hg.python.org/cpython/rev/688c6b16228e changeset: 100788:688c6b16228e parent: 100786:838351df5ff2 parent: 100787:c38ac7ab8d9a user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Mar 29 13:46:53 2016 +0200 summary: Null merge 3.5 files: -- Repository URL: https://hg.python.org/cpython

1 0