Mailman 3 June 2013 - Python-checkins

cpython (3.3): Issue #18103: Update README.txt and test_idle to describe and run gui tests.
by terry.reedy June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/c818c215f1a4 changeset: 84383:c818c215f1a4 branch: 3.3 parent: 84372:b3d19f0494e7 user: Terry Jan Reedy <tjreedy(a)udel.edu> date: Sat Jun 29 18:22:02 2013 -0400 summary: Issue #18103: Update README.txt and test_idle to describe and run gui tests. files: Lib/idlelib/idle_test/README.txt | 93 +++++++++++++------ Lib/test/test_idle.py | 5 + 2 files changed, 70 insertions(+), 28 deletions(-) diff --git a/Lib/idlelib/idle_test/README.txt b/Lib/idlelib/idle_test/README.txt --- a/Lib/idlelib/idle_test/README.txt +++ b/Lib/idlelib/idle_test/README.txt @@ -1,14 +1,19 @@ README FOR IDLE TESTS IN IDLELIB.IDLE_TEST + +1. Test Files + The idle directory, idlelib, has over 60 xyz.py files. The idle_test -subdirectory should contain a test_xyy.py for each one. (For test modules, -make 'xyz' lower case.) Each should start with the following cut-paste -template, with the blanks after after '.'. 'as', and '_' filled in. +subdirectory should contain a test_xyy.py for each. (For test modules, make +'xyz' lower case, and possibly shorten it.) Each file should start with the +something like the following template, with the blanks after after '.' and 'as', +and before and after '_' filled in. --- import unittest -import idlelib. as +from test.support import requires +import idlelib. as -class Test_(unittest.TestCase): +class _Test(unittest.TestCase): def test_(self): @@ -21,43 +26,75 @@ with xyz (lowercased) added after 'test_'. --- if __name__ == "__main__": + from test import support; support.use_resources = ['gui'] import unittest unittest.main('idlelib.idle_test.test_', verbosity=2, exit=False) --- -In Idle, pressing F5 in an editor window with either xyz.py or test_xyz.py -loaded will then run the test with the version of Python running Idle and -tracebacks will appear in the Shell window. The options are appropriate for -developers running (as opposed to importing) either type of file during -development: verbosity=2 lists all test_y methods; exit=False avoids a -spurious sys.exit traceback when running in Idle. The following command -lines also run test_xyz.py + +2. Gui Tests + +Gui tests need 'requires' and 'use_resources' from test.support +(test.test_support in 2.7). A test is a gui test if it creates a Tk root or +master object either directly or indirectly by instantiating a tkinter or +idle class. For the benefit of buildbot machines that do not have a graphics +screen, gui tests must be 'guarded' by "requires('gui')" in a setUp +function or method. This will typically be setUpClass. +--- + @classmethod + def setUpClass(cls): + requires('gui') +--- +All gui objects must be destroyed by the end of the test, perhaps in a tearDown +function. + +Support.requires('gui') returns true if it is either called in a main module +(which never happens on buildbots) or if use_resources contains 'gui'. +Use_resources is set by test.regrtest but not by unittest. So when running +tests in another module with unittest, we set it ourselves, as in the xyz.py +template above. + +Since non-gui tests always run, but gui tests only sometimes, tests of non-gui +operations should best avoid needing a gui. Methods that make incidental use of +tkinter variables and messageboxes can do this by using the mock classes in +idle_test/mock_tk.py. + + +3. Running Tests + +Assume that xyz.py and test_xyz.py end with the "if __name__" statements given +above. In Idle, pressing F5 in an editor window with either loaded will run all +tests in the test_xyz file with the version of Python running Idle. The test +report and any tracebacks will appear in the Shell window. The options in these +"if __name__" statements are appropriate for developers running (as opposed to +importing) either of the files during development: verbosity=2 lists all test +methods in the file; exit=False avoids a spurious sys.exit traceback that would +otherwise occur when running in Idle. The following command lines also run +all test methods, including gui tests, in test_xyz.py. (The exceptions are that +idlelib and idlelib.idle start Idle and idlelib.PyShell should (issue 18330).) python -m idlelib.xyz # With the capitalization of the xyz module -python -m unittest -v idlelib.idle_test.test_xyz +python -m idlelib.idle_test.test_xyz -To run all idle tests either interactively ('>>>', with unittest imported) -or from a command line, use one of the following. +To run all idle_test/test_*.py tests, either interactively +('>>>', with unittest imported) or from a command line, use one of the +following. (Notes: unittest does not run gui tests; in 2.7, 'test ' (with the +space) is 'test.regrtest '; where present, -v and -ugui can be omitted.) >>> unittest.main('idlelib.idle_test', verbosity=2, exit=False) python -m unittest -v idlelib.idle_test +python -m test -v -ugui test_idle python -m test.test_idle -python -m test test_idle -The idle tests are 'discovered' in idlelib.idle_test.__init__.load_tests, +The idle tests are 'discovered' by idlelib.idle_test.__init__.load_tests, which is also imported into test.test_idle. Normally, neither file should be -changed when working on individual test modules. The last command runs runs +changed when working on individual test modules. The third command runs runs unittest indirectly through regrtest. The same happens when the entire test -suite is run with 'python -m test'. So it must work for buildbots to stay green. +suite is run with 'python -m test'. So that command must work for buildbots +to stay green. Idle tests must not disturb the environment in a way that +makes other tests fail (issue 18081). -To run an individual Testcase or test method, extend the -dotted name given to unittest on the command line. +To run an individual Testcase or test method, extend the dotted name given to +unittest on the command line. (But gui tests will not this way.) python -m unittest -v idlelib.idle_test.text_xyz.Test_case.test_meth - -To disable test/test_idle.py, there are at least two choices. -a. Comment out 'load_tests' line, no no tests are discovered (simple and safe); -Running no tests passes, so there is no indication that nothing was run. -b.Before that line, make module an unexpected skip for regrtest with -import unittest; raise unittest.SkipTest('skip for buildbots') -When run directly with unittest, this causes a normal exit and traceback. \ No newline at end of file diff --git a/Lib/test/test_idle.py b/Lib/test/test_idle.py --- a/Lib/test/test_idle.py +++ b/Lib/test/test_idle.py @@ -10,5 +10,10 @@ load_tests = idletest.load_tests if __name__ == '__main__': + # Until unittest supports resources, we emulate regrtest's -ugui + # so loaded tests run the same as if textually present here. + # If any Idle test ever needs another resource, add it to the list. + from test import support + support.use_resources = ['gui'] # use_resources is initially None import unittest unittest.main(verbosity=2, exit=False) -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix memory leak in pyexpat PyUnknownEncodingHandler
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/bd0834b59828 changeset: 84375:bd0834b59828 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 20:43:13 2013 +0200 summary: Fix memory leak in pyexpat PyUnknownEncodingHandler CID 1040367 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable u going out of scope leaks the storage it points to. files: Modules/pyexpat.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1128,8 +1128,10 @@ } u = PyUnicode_Decode((char*) template_buffer, 256, name, "replace"); - if (u == NULL || PyUnicode_READY(u)) + if (u == NULL || PyUnicode_READY(u)) { + Py_DECREF(u); return XML_STATUS_ERROR; + } if (PyUnicode_GET_LENGTH(u) != 256) { Py_DECREF(u); -- Repository URL: http://hg.python.org/cpython

4 4

cpython: Fix segfault in pyexpat.c caused by 84375
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/4c7426c3ceab changeset: 84382:4c7426c3ceab user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:49:27 2013 +0200 summary: Fix segfault in pyexpat.c caused by 84375 u can be NULL, use XDECREF files: Modules/pyexpat.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/pyexpat.c b/Modules/pyexpat.c --- a/Modules/pyexpat.c +++ b/Modules/pyexpat.c @@ -1129,7 +1129,7 @@ u = PyUnicode_Decode((char*) template_buffer, 256, name, "replace"); if (u == NULL || PyUnicode_READY(u)) { - Py_DECREF(u); + Py_XDECREF(u); return XML_STATUS_ERROR; } -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix resource leak in pickle module
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/ac7bc6700ac3 changeset: 84381:ac7bc6700ac3 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:37:34 2013 +0200 summary: Fix resource leak in pickle module CID 983309 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable unicode_str going out of scope leaks the storage it points to. files: Modules/_pickle.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Modules/_pickle.c b/Modules/_pickle.c --- a/Modules/_pickle.c +++ b/Modules/_pickle.c @@ -1748,8 +1748,10 @@ return -1; if (latin1 == NULL) { latin1 = PyUnicode_InternFromString("latin1"); - if (latin1 == NULL) + if (latin1 == NULL) { + Py_DECREF(unicode_str); return -1; + } } reduce_value = Py_BuildValue("(O(OO))", codecs_encode, unicode_str, latin1); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix ref leak in error case of unicode find, count, formatlong
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/cad335e0b205 changeset: 84380:cad335e0b205 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:33:36 2013 +0200 summary: Fix ref leak in error case of unicode find, count, formatlong CID 983315: Resource leak (RESOURCE_LEAK) CID 983316: Resource leak (RESOURCE_LEAK) CID 983317: Resource leak (RESOURCE_LEAK) files: Objects/unicodeobject.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -10875,8 +10875,10 @@ kind1 = PyUnicode_KIND(self); kind2 = PyUnicode_KIND(substring); - if (kind2 > kind1) + if (kind2 > kind1) { + Py_DECREF(substring); return PyLong_FromLong(0); + } kind = kind1; buf1 = PyUnicode_DATA(self); buf2 = PyUnicode_DATA(substring); @@ -11054,10 +11056,14 @@ &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) - return NULL; - if (PyUnicode_READY(substring) == -1) - return NULL; + if (PyUnicode_READY(self) == -1) { + Py_DECREF(substring); + return NULL; + } + if (PyUnicode_READY(substring) == -1) { + Py_DECREF(substring); + return NULL; + } result = any_find_slice(1, self, substring, start, end); @@ -13581,12 +13587,14 @@ /* To modify the string in-place, there can only be one reference. */ if (Py_REFCNT(result) != 1) { + Py_DECREF(result); PyErr_BadInternalCall(); return NULL; } buf = PyUnicode_DATA(result); llen = PyUnicode_GET_LENGTH(result); if (llen > INT_MAX) { + Py_DECREF(result); PyErr_SetString(PyExc_ValueError, "string too large in _PyBytes_FormatLong"); return NULL; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix ref leak in error case of unicode index
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/ec036132cc28 changeset: 84379:ec036132cc28 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:21:37 2013 +0200 summary: Fix ref leak in error case of unicode index CID 983319 (#1 of 2): Resource leak (RESOURCE_LEAK) leaked_storage: Variable substring going out of scope leaks the storage it points to. files: Objects/unicodeobject.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -11180,10 +11180,14 @@ &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) - return NULL; - if (PyUnicode_READY(substring) == -1) - return NULL; + if (PyUnicode_READY(self) == -1) { + Py_DECREF(substring); + return NULL; + } + if (PyUnicode_READY(substring) == -1) { + Py_DECREF(substring); + return NULL; + } result = any_find_slice(1, self, substring, start, end); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix ref leak in error case of unicode rindex and rfind
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/d0fb17896c95 changeset: 84378:d0fb17896c95 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:17:34 2013 +0200 summary: Fix ref leak in error case of unicode rindex and rfind CID 983320: Resource leak (RESOURCE_LEAK) CID 983321: Resource leak (RESOURCE_LEAK) leaked_storage: Variable substring going out of scope leaks the storage it points to. files: Objects/unicodeobject.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -12248,10 +12248,14 @@ &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) - return NULL; - if (PyUnicode_READY(substring) == -1) - return NULL; + if (PyUnicode_READY(self) == -1) { + Py_DECREF(substring); + return NULL; + } + if (PyUnicode_READY(substring) == -1) { + Py_DECREF(substring); + return NULL; + } result = any_find_slice(-1, self, substring, start, end); @@ -12280,10 +12284,14 @@ &start, &end)) return NULL; - if (PyUnicode_READY(self) == -1) - return NULL; - if (PyUnicode_READY(substring) == -1) - return NULL; + if (PyUnicode_READY(self) == -1) { + Py_DECREF(substring); + return NULL; + } + if (PyUnicode_READY(substring) == -1) { + Py_DECREF(substring); + return NULL; + } result = any_find_slice(-1, self, substring, start, end); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix resource leak in parser, free node ptr
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/117752c21072 changeset: 84377:117752c21072 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 21:03:51 2013 +0200 summary: Fix resource leak in parser, free node ptr CID 1028068 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable n going out of scope leaks the storage it points to. files: Parser/pgenmain.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Parser/pgenmain.c b/Parser/pgenmain.c --- a/Parser/pgenmain.c +++ b/Parser/pgenmain.c @@ -113,6 +113,7 @@ Py_Exit(1); } g = pgen(n); + PyNode_Free(n); if (g == NULL) { printf("Bad grammar.\n"); Py_Exit(1); -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix NULL ptr dereferencing in local_timezone(). nameo can be NULL
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/ecc7f6f069f4 changeset: 84376:ecc7f6f069f4 user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 20:52:33 2013 +0200 summary: Fix NULL ptr dereferencing in local_timezone(). nameo can be NULL CID 1040362 (#1 of 1): Explicit null dereferenced (FORWARD_NULL) var_deref_op: Dereferencing null pointer _py_decref_tmp. files: Modules/_datetimemodule.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Modules/_datetimemodule.c b/Modules/_datetimemodule.c --- a/Modules/_datetimemodule.c +++ b/Modules/_datetimemodule.c @@ -4749,7 +4749,7 @@ goto error; } result = new_timezone(delta, nameo); - Py_DECREF(nameo); + Py_XDECREF(nameo); error: Py_DECREF(delta); return result; -- Repository URL: http://hg.python.org/cpython

1 0

cpython: Fix memory leak in endswith
by christian.heimes June 29, 2013

June 29, 2013

http://hg.python.org/cpython/rev/787b0f99d77b changeset: 84374:787b0f99d77b user: Christian Heimes <christian(a)cheimes.de> date: Sat Jun 29 20:41:06 2013 +0200 summary: Fix memory leak in endswith CID 1040368 (#1 of 1): Resource leak (RESOURCE_LEAK) leaked_storage: Variable substring going out of scope leaks the storage it points to. files: Objects/unicodeobject.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c --- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -12941,9 +12941,9 @@ return NULL; } result = tailmatch(self, substring, start, end, +1); + Py_DECREF(substring); if (result == -1) return NULL; - Py_DECREF(substring); return PyBool_FromLong(result); } -- Repository URL: http://hg.python.org/cpython

1 0