Mailman 3 December 2021 - Python-checkins

bpo-45496: Allow flexibility in winfo_rgb tests (GH-30185)
by miss-islington Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/bb0b5c12419b8fa657c96185d62212aea9… commit: bb0b5c12419b8fa657c96185d62212aea975f500 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-26T04:04:26-08:00 summary: bpo-45496: Allow flexibility in winfo_rgb tests (GH-30185) (cherry picked from commit 2e3e0d23adca8d83722d939d6abd1e467d7578f7) Co-authored-by: E-Paine <63801254+E-Paine(a)users.noreply.github.com> files: M Lib/tkinter/test/test_tkinter/test_misc.py diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py index b9201f1070940..8898a74c46f13 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/Lib/tkinter/test/test_tkinter/test_misc.py @@ -200,6 +200,13 @@ def test_clipboard_astral(self): root.clipboard_get() def test_winfo_rgb(self): + + def assertApprox(col1, col2): + # A small amount of flexibility is required (bpo-45496) + # 33 is ~0.05% of 65535, which is a reasonable margin + for col1_channel, col2_channel in zip(col1, col2): + self.assertAlmostEqual(col1_channel, col2_channel, delta=33) + root = self.root rgb = root.winfo_rgb @@ -209,9 +216,9 @@ def test_winfo_rgb(self): # #RGB - extends each 4-bit hex value to be 16-bit. self.assertEqual(rgb('#F0F'), (0xFFFF, 0x0000, 0xFFFF)) # #RRGGBB - extends each 8-bit hex value to be 16-bit. - self.assertEqual(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c)) + assertApprox(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c)) # #RRRRGGGGBBBB - self.assertEqual(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939)) + assertApprox(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939)) # Invalid string. with self.assertRaises(tkinter.TclError): rgb('#123456789a')

1 0

[3.9] bpo-23819: Fix asyncio tests on python optimized mode (GH-30195) (GH-30265)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/07229054a129a72b4ffdf29252eb73c615… commit: 07229054a129a72b4ffdf29252eb73c6154c0ccf branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:54:18+02:00 summary: [3.9] bpo-23819: Fix asyncio tests on python optimized mode (GH-30195) (GH-30265) (cherry picked from commit a23ab7b6d8b3ae3a47747c0c4bceb2370cc48dcc) Co-authored-by: Kumar Aditya <59607654+kumaraditya303(a)users.noreply.github.com> files: A Misc/NEWS.d/next/Tests/2021-12-19-08-44-32.bpo-23819.9ueiII.rst M Lib/asyncio/base_events.py M Lib/test/test_asyncio/test_base_events.py M Lib/test/test_asyncio/test_proactor_events.py M Lib/test/test_asyncio/test_selector_events.py diff --git a/Lib/asyncio/base_events.py b/Lib/asyncio/base_events.py index bb2f99150b115..8c1fb49694875 100644 --- a/Lib/asyncio/base_events.py +++ b/Lib/asyncio/base_events.py @@ -1290,8 +1290,8 @@ async def create_datagram_endpoint(self, protocol_factory, addr_infos = {} # Using order preserving dict for idx, addr in ((0, local_addr), (1, remote_addr)): if addr is not None: - assert isinstance(addr, tuple) and len(addr) == 2, ( - '2-tuple is expected') + if not (isinstance(addr, tuple) and len(addr) == 2): + raise TypeError('2-tuple is expected') infos = await self._ensure_resolved( addr, family=family, type=socket.SOCK_DGRAM, diff --git a/Lib/test/test_asyncio/test_base_events.py b/Lib/test/test_asyncio/test_base_events.py index 533d5cc7f5038..4886da28bdf14 100644 --- a/Lib/test/test_asyncio/test_base_events.py +++ b/Lib/test/test_asyncio/test_base_events.py @@ -1592,11 +1592,11 @@ def test_create_datagram_endpoint_addr_error(self): coro = self.loop.create_datagram_endpoint( MyDatagramProto, local_addr='localhost') self.assertRaises( - AssertionError, self.loop.run_until_complete, coro) + TypeError, self.loop.run_until_complete, coro) coro = self.loop.create_datagram_endpoint( MyDatagramProto, local_addr=('localhost', 1, 2, 3)) self.assertRaises( - AssertionError, self.loop.run_until_complete, coro) + TypeError, self.loop.run_until_complete, coro) def test_create_datagram_endpoint_connect_err(self): self.loop.sock_connect = mock.Mock() diff --git a/Lib/test/test_asyncio/test_proactor_events.py b/Lib/test/test_asyncio/test_proactor_events.py index 451f86ae0274f..59d5e5b6ccb63 100644 --- a/Lib/test/test_asyncio/test_proactor_events.py +++ b/Lib/test/test_asyncio/test_proactor_events.py @@ -72,6 +72,7 @@ def test_loop_reading_data(self): self.loop._proactor.recv.assert_called_with(self.sock, 32768) self.protocol.data_received.assert_called_with(b'data') + @unittest.skipIf(sys.flags.optimize, "Assertions are disabled in optimized mode") def test_loop_reading_no_data(self): res = self.loop.create_future() res.set_result(b'') @@ -853,6 +854,7 @@ def test_datagram_loop_reading_data(self): self.protocol.datagram_received.assert_called_with(b'data', ('127.0.0.1', 12068)) close_transport(tr) + @unittest.skipIf(sys.flags.optimize, "Assertions are disabled in optimized mode") def test_datagram_loop_reading_no_data(self): res = self.loop.create_future() res.set_result((b'', ('127.0.0.1', 12068))) diff --git a/Lib/test/test_asyncio/test_selector_events.py b/Lib/test/test_asyncio/test_selector_events.py index 1613c753c26ee..b684fab2771f2 100644 --- a/Lib/test/test_asyncio/test_selector_events.py +++ b/Lib/test/test_asyncio/test_selector_events.py @@ -1,5 +1,6 @@ """Tests for selector_events.py""" +import sys import selectors import socket import unittest @@ -804,6 +805,7 @@ def test_write_ready_closing(self): self.sock.close.assert_called_with() self.protocol.connection_lost.assert_called_with(None) + @unittest.skipIf(sys.flags.optimize, "Assertions are disabled in optimized mode") def test_write_ready_no_data(self): transport = self.socket_transport() # This is an internal error. diff --git a/Misc/NEWS.d/next/Tests/2021-12-19-08-44-32.bpo-23819.9ueiII.rst b/Misc/NEWS.d/next/Tests/2021-12-19-08-44-32.bpo-23819.9ueiII.rst new file mode 100644 index 0000000000000..4ef0fe6f6d5fa --- /dev/null +++ b/Misc/NEWS.d/next/Tests/2021-12-19-08-44-32.bpo-23819.9ueiII.rst @@ -0,0 +1 @@ +Fixed :mod:`asyncio` tests in python optimized mode. Patch by Kumar Aditya. \ No newline at end of file

1 0

Fix typo in io.rst (GH-30218)
by miss-islington Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/a55082085cbc59733ecc932cc2e7d544be… commit: a55082085cbc59733ecc932cc2e7d544be8c6a7d branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-26T03:52:46-08:00 summary: Fix typo in io.rst (GH-30218) (cherry picked from commit f9a4352056175d96195d4cb54c97c1334ea5150c) Co-authored-by: David Gilbertson <gilbertson.david(a)gmail.com> files: M Doc/library/io.rst diff --git a/Doc/library/io.rst b/Doc/library/io.rst index 0881015c7fad6..de88c572f3662 100644 --- a/Doc/library/io.rst +++ b/Doc/library/io.rst @@ -131,7 +131,7 @@ explicitly when opening text files. If you want to use UTF-8, pass ``encoding="utf-8"``. To use the current locale encoding, ``encoding="locale"`` is supported in Python 3.10. -When you need to run existing code on Windows that attempts to opens +When you need to run existing code on Windows that attempts to open UTF-8 files using the default locale encoding, you can enable the UTF-8 mode. See :ref:`UTF-8 mode on Windows <win-utf8-mode>`.

1 0

doc: fix a typo in unittest.mock.rst (GH-30227) (GH-30263)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/f1f54c8fb94de6176767f2163a4ed80a96… commit: f1f54c8fb94de6176767f2163a4ed80a9660494a branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:51:57+02:00 summary: doc: fix a typo in unittest.mock.rst (GH-30227) (GH-30263) (cherry picked from commit 10bf0a9ac3c9bbde2fa8989d9435462f0e7da545) Co-authored-by: Joe <nigelchiang(a)outlook.com> files: M Doc/library/unittest.mock.rst diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index 3c74b61779d47..3fbb1b6b83a76 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1515,7 +1515,7 @@ attribute in a class) that does not exist will fail with :exc:`AttributeError`:: >>> test() Traceback (most recent call last): ... - AttributeError: <module 'sys' (built-in)> does not have the attribute 'non_existing' + AttributeError: <module 'sys' (built-in)> does not have the attribute 'non_existing_attribute' but adding ``create=True`` in the call to :func:`patch` will make the previous example work as expected::

1 0

doc: fix a typo in unittest.mock.rst (GH-30227)
by miss-islington Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/cfdb2302f48b4da5cf4ee78c092edf1f44… commit: cfdb2302f48b4da5cf4ee78c092edf1f447ae494 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-26T03:51:42-08:00 summary: doc: fix a typo in unittest.mock.rst (GH-30227) (cherry picked from commit 10bf0a9ac3c9bbde2fa8989d9435462f0e7da545) Co-authored-by: Joe <nigelchiang(a)outlook.com> files: M Doc/library/unittest.mock.rst diff --git a/Doc/library/unittest.mock.rst b/Doc/library/unittest.mock.rst index d0640b42ef40a..4d74f9cee84ee 100644 --- a/Doc/library/unittest.mock.rst +++ b/Doc/library/unittest.mock.rst @@ -1516,7 +1516,7 @@ attribute in a class) that does not exist will fail with :exc:`AttributeError`:: >>> test() Traceback (most recent call last): ... - AttributeError: <module 'sys' (built-in)> does not have the attribute 'non_existing' + AttributeError: <module 'sys' (built-in)> does not have the attribute 'non_existing_attribute' but adding ``create=True`` in the call to :func:`patch` will make the previous example work as expected::

1 0

docs: Fix typos and use anchor for internal link (GH-30236)
by miss-islington Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/d968e422efa2050ff2c88467e7cea61ba5… commit: d968e422efa2050ff2c88467e7cea61ba5c55576 branch: 3.10 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: miss-islington <31488909+miss-islington(a)users.noreply.github.com> date: 2021-12-26T03:29:58-08:00 summary: docs: Fix typos and use anchor for internal link (GH-30236) (cherry picked from commit c1d7a6bed9f2bb8cb7612d196fc0caba016fa98c) Co-authored-by: Rafael Fontenelle <rffontenelle(a)users.noreply.github.com> files: M Doc/whatsnew/3.10.rst diff --git a/Doc/whatsnew/3.10.rst b/Doc/whatsnew/3.10.rst index 978651f33b206..c07523c49163b 100644 --- a/Doc/whatsnew/3.10.rst +++ b/Doc/whatsnew/3.10.rst @@ -1426,7 +1426,7 @@ and to match the behavior of static type checkers specified in the PEP. 1. ``Literal`` now de-duplicates parameters. 2. Equality comparisons between ``Literal`` objects are now order independent. -3. ``Literal`` comparisons now respects types. For example, +3. ``Literal`` comparisons now respect types. For example, ``Literal[0] == Literal[False]`` previously evaluated to ``True``. It is now ``False``. To support this change, the internally used type cache now supports differentiating types. @@ -1643,13 +1643,12 @@ Deprecated :meth:`importlib.machinery.FrozenImporter.find_module`, :meth:`importlib.machinery.WindowsRegistryFinder.find_module`, :meth:`importlib.machinery.PathFinder.find_module`, - :meth:`importlib.abc.MetaPathFinder.find_module`), + :meth:`importlib.abc.MetaPathFinder.find_module` ), :meth:`importlib.abc.PathEntryFinder.find_module` ( - :meth:`importlib.machinery.FileFinder.find_module`, - ), and + :meth:`importlib.machinery.FileFinder.find_module` ), and :meth:`importlib.abc.PathEntryFinder.find_loader` ( - :meth:`importlib.machinery.FileFinder.find_loader` - ) now raise :exc:`DeprecationWarning` and are slated for removal in + :meth:`importlib.machinery.FileFinder.find_loader` ) + now raise :exc:`DeprecationWarning` and are slated for removal in Python 3.12 (previously they were documented as deprecated in Python 3.4). (Contributed by Brett Cannon in :issue:`42135`.) @@ -1690,7 +1689,7 @@ Deprecated * :func:`asyncio.get_event_loop` now emits a deprecation warning if there is no running event loop. In the future it will be an alias of :func:`~asyncio.get_running_loop`. - :mod:`asyncio` functions which implicitly create a :class:`~asyncio.Future` + :mod:`asyncio` functions which implicitly create :class:`~asyncio.Future` or :class:`~asyncio.Task` objects now emit a deprecation warning if there is no running event loop and no explicit *loop* argument is passed: :func:`~asyncio.ensure_future`, @@ -1830,7 +1829,7 @@ Removed running in different threads. Note that the low-level API will still accept ``loop``. - See `Changes in the Python API`_ for examples of how to replace existing code. + See :ref:`changes-python-api` for examples of how to replace existing code. (Contributed by Yurii Karabas, Andrew Svetlov, Yury Selivanov and Kyle Stanley in :issue:`42392`.) @@ -1854,6 +1853,7 @@ Changes in the Python syntax following keyword. (Contributed by Serhiy Storchaka in :issue:`43833`). +.. _changes-python-api: Changes in the Python API ------------------------- @@ -1975,7 +1975,7 @@ Build Changes (Contributed by Victor Stinner in :issue:`36020`.) * :mod:`sqlite3` requires SQLite 3.7.15 or higher. (Contributed by Sergey Fedoseev - and Erlend E. Aasland :issue:`40744` and :issue:`40810`.) + and Erlend E. Aasland in :issue:`40744` and :issue:`40810`.) * The :mod:`atexit` module must now always be built as a built-in module. (Contributed by Victor Stinner in :issue:`42639`.)

1 0

bpo-45496: Allow flexibility in winfo_rgb tests (GH-30185)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/2e3e0d23adca8d83722d939d6abd1e467d… commit: 2e3e0d23adca8d83722d939d6abd1e467d7578f7 branch: main author: E-Paine <63801254+E-Paine(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:28:24+02:00 summary: bpo-45496: Allow flexibility in winfo_rgb tests (GH-30185) files: M Lib/tkinter/test/test_tkinter/test_misc.py diff --git a/Lib/tkinter/test/test_tkinter/test_misc.py b/Lib/tkinter/test/test_tkinter/test_misc.py index 2c78eaca2c85b..044eb10d68835 100644 --- a/Lib/tkinter/test/test_tkinter/test_misc.py +++ b/Lib/tkinter/test/test_tkinter/test_misc.py @@ -201,6 +201,13 @@ def test_clipboard_astral(self): root.clipboard_get() def test_winfo_rgb(self): + + def assertApprox(col1, col2): + # A small amount of flexibility is required (bpo-45496) + # 33 is ~0.05% of 65535, which is a reasonable margin + for col1_channel, col2_channel in zip(col1, col2): + self.assertAlmostEqual(col1_channel, col2_channel, delta=33) + root = self.root rgb = root.winfo_rgb @@ -210,9 +217,9 @@ def test_winfo_rgb(self): # #RGB - extends each 4-bit hex value to be 16-bit. self.assertEqual(rgb('#F0F'), (0xFFFF, 0x0000, 0xFFFF)) # #RRGGBB - extends each 8-bit hex value to be 16-bit. - self.assertEqual(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c)) + assertApprox(rgb('#4a3c8c'), (0x4a4a, 0x3c3c, 0x8c8c)) # #RRRRGGGGBBBB - self.assertEqual(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939)) + assertApprox(rgb('#dede14143939'), (0xdede, 0x1414, 0x3939)) # Invalid string. with self.assertRaises(tkinter.TclError): rgb('#123456789a')

1 0

bpo-43413: Revert changes in set.__init__ (GH-28403)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/ad4857884b4821fc2c9bd23b63d03f9570… commit: ad4857884b4821fc2c9bd23b63d03f9570eb03d1 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:27:01+02:00 summary: bpo-43413: Revert changes in set.__init__ (GH-28403) Co-authored-by: Jason R. Coombs <jaraco(a)jaraco.com> files: A Misc/NEWS.d/next/Core and Builtins/2021-05-30-16-37-47.bpo-43413.vYFPPC1.rst M Lib/test/test_set.py M Misc/NEWS.d/3.11.0a1.rst M Objects/setobject.c diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py index 65fda9e469bcc..77f3da40c063a 100644 --- a/Lib/test/test_set.py +++ b/Lib/test/test_set.py @@ -667,10 +667,13 @@ def __new__(cls, arg, newarg=None): self = super().__new__(cls, arg) self.newarg = newarg return self - u = subclass_with_new([1, 2], newarg=3) + u = subclass_with_new([1, 2]) self.assertIs(type(u), subclass_with_new) self.assertEqual(set(u), {1, 2}) - self.assertEqual(u.newarg, 3) + self.assertIsNone(u.newarg) + # disallow kwargs in __new__ only (https://bugs.python.org/issue43413#msg402000) + with self.assertRaises(TypeError): + subclass_with_new([1, 2], newarg=3) class TestFrozenSet(TestJointOps, unittest.TestCase): diff --git a/Misc/NEWS.d/3.11.0a1.rst b/Misc/NEWS.d/3.11.0a1.rst index 28b81b75266fc..fa30c693c34c1 100644 --- a/Misc/NEWS.d/3.11.0a1.rst +++ b/Misc/NEWS.d/3.11.0a1.rst @@ -1140,7 +1140,7 @@ blocks. Patch by Pablo Galindo. Constructors of subclasses of some builtin classes (e.g. :class:`tuple`, :class:`list`, :class:`frozenset`) no longer accept arbitrary keyword -arguments. Subclass of :class:`set` can now define a ``__new__()`` method +arguments. [reverted in 3.11a4] Subclass of :class:`set` can now define a ``__new__()`` method with additional keyword parameters without overriding also ``__init__()``. .. diff --git a/Misc/NEWS.d/next/Core and Builtins/2021-05-30-16-37-47.bpo-43413.vYFPPC1.rst b/Misc/NEWS.d/next/Core and Builtins/2021-05-30-16-37-47.bpo-43413.vYFPPC1.rst new file mode 100644 index 0000000000000..cf879eceeb721 --- /dev/null +++ b/Misc/NEWS.d/next/Core and Builtins/2021-05-30-16-37-47.bpo-43413.vYFPPC1.rst @@ -0,0 +1 @@ +Revert changes in ``set.__init__``. Subclass of :class:`set` needs to define a ``__init__()`` method if it defines a ``__new__()`` method with additional keyword parameters. diff --git a/Objects/setobject.c b/Objects/setobject.c index 0be067857d694..6e110ef196c82 100644 --- a/Objects/setobject.c +++ b/Objects/setobject.c @@ -1946,9 +1946,7 @@ set_init(PySetObject *self, PyObject *args, PyObject *kwds) { PyObject *iterable = NULL; - if ((Py_IS_TYPE(self, &PySet_Type) || - Py_TYPE(self)->tp_new == PySet_Type.tp_new) && - !_PyArg_NoKeywords("set", kwds)) + if (!_PyArg_NoKeywords("set", kwds)) return -1; if (!PyArg_UnpackTuple(args, Py_TYPE(self)->tp_name, 0, 1, &iterable)) return -1;

1 0

[3.9] Remove a NEWS entry for bpo-45878 (GH-30258) (GH-30260)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/bee660e46ae2a051400177dcd758d95b5b… commit: bee660e46ae2a051400177dcd758d95b5b4a6fcc branch: 3.9 author: Miss Islington (bot) <31488909+miss-islington(a)users.noreply.github.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:25:49+02:00 summary: [3.9] Remove a NEWS entry for bpo-45878 (GH-30258) (GH-30260) The docs linter complains about it, and in general news entries for such changes are not required. (cherry picked from commit 11909c12c75a7f377460561abc97707a4006fc07) Co-authored-by: Serhiy Storchaka <storchaka(a)gmail.com> files: D Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst diff --git a/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst b/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst deleted file mode 100644 index fca90ef46981b..0000000000000 --- a/Misc/NEWS.d/next/Tests/2021-11-23-12-36-21.bpo-45878.eOs_Mp.rst +++ /dev/null @@ -1,2 +0,0 @@ -Test ``Lib/ctypes/test/test_functions.py::test_mro`` now uses -``self.assertRaises`` instead of ``try/except``.

1 0

bpo-22815: Print unexpected successes in summary in TextTestResult (GH-30138)
by serhiy-storchaka Dec. 26, 2021

Dec. 26, 2021

https://github.com/python/cpython/commit/1944434b44e0118e812bf63f47b268ff6d… commit: 1944434b44e0118e812bf63f47b268ff6dd0c8f1 branch: main author: Serhiy Storchaka <storchaka(a)gmail.com> committer: serhiy-storchaka <storchaka(a)gmail.com> date: 2021-12-26T13:22:44+02:00 summary: bpo-22815: Print unexpected successes in summary in TextTestResult (GH-30138) files: A Misc/NEWS.d/next/Library/2021-12-16-12-54-21.bpo-22815.0NRH8s.rst M Lib/unittest/runner.py M Lib/unittest/test/test_program.py diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py index 120ee6aba3570..6678adb6a7d81 100644 --- a/Lib/unittest/runner.py +++ b/Lib/unittest/runner.py @@ -142,6 +142,12 @@ def printErrors(self): self.stream.flush() self.printErrorList('ERROR', self.errors) self.printErrorList('FAIL', self.failures) + unexpectedSuccesses = getattr(self, 'unexpectedSuccesses', ()) + if unexpectedSuccesses: + self.stream.writeln(self.separator1) + for test in unexpectedSuccesses: + self.stream.writeln(f"UNEXPECTED SUCCESS: {self.getDescription(test)}") + self.stream.flush() def printErrorList(self, flavour, errors): for test, err in errors: diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_program.py index 2bf7dd72ed21c..f7049fbb24e7b 100644 --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -61,6 +61,17 @@ def testPass(self): pass def testFail(self): raise AssertionError + def testError(self): + 1/0 + @unittest.skip('skipping') + def testSkipped(self): + raise AssertionError + @unittest.expectedFailure + def testExpectedFailure(self): + raise AssertionError + @unittest.expectedFailure + def testUnexpectedSuccess(self): + pass class FooBarLoader(unittest.TestLoader): """Test loader that returns a suite containing FooBar.""" @@ -111,9 +122,13 @@ def test_NonExit(self): testRunner=unittest.TextTestRunner(stream=stream), testLoader=self.FooBarLoader()) self.assertTrue(hasattr(program, 'result')) - self.assertIn('\nFAIL: testFail ', stream.getvalue()) - self.assertTrue(stream.getvalue().endswith('\n\nFAILED (failures=1)\n')) - + out = stream.getvalue() + self.assertIn('\nFAIL: testFail ', out) + self.assertIn('\nERROR: testError ', out) + self.assertIn('\nUNEXPECTED SUCCESS: testUnexpectedSuccess ', out) + expected = ('\n\nFAILED (failures=1, errors=1, skipped=1, ' + 'expected failures=1, unexpected successes=1)\n') + self.assertTrue(out.endswith(expected)) def test_Exit(self): stream = BufferedWriter() @@ -124,9 +139,13 @@ def test_Exit(self): testRunner=unittest.TextTestRunner(stream=stream), exit=True, testLoader=self.FooBarLoader()) - self.assertIn('\nFAIL: testFail ', stream.getvalue()) - self.assertTrue(stream.getvalue().endswith('\n\nFAILED (failures=1)\n')) - + out = stream.getvalue() + self.assertIn('\nFAIL: testFail ', out) + self.assertIn('\nERROR: testError ', out) + self.assertIn('\nUNEXPECTED SUCCESS: testUnexpectedSuccess ', out) + expected = ('\n\nFAILED (failures=1, errors=1, skipped=1, ' + 'expected failures=1, unexpected successes=1)\n') + self.assertTrue(out.endswith(expected)) def test_ExitAsDefault(self): stream = BufferedWriter() @@ -136,8 +155,13 @@ def test_ExitAsDefault(self): argv=["foobar"], testRunner=unittest.TextTestRunner(stream=stream), testLoader=self.FooBarLoader()) - self.assertIn('\nFAIL: testFail ', stream.getvalue()) - self.assertTrue(stream.getvalue().endswith('\n\nFAILED (failures=1)\n')) + out = stream.getvalue() + self.assertIn('\nFAIL: testFail ', out) + self.assertIn('\nERROR: testError ', out) + self.assertIn('\nUNEXPECTED SUCCESS: testUnexpectedSuccess ', out) + expected = ('\n\nFAILED (failures=1, errors=1, skipped=1, ' + 'expected failures=1, unexpected successes=1)\n') + self.assertTrue(out.endswith(expected)) class InitialisableProgram(unittest.TestProgram): diff --git a/Misc/NEWS.d/next/Library/2021-12-16-12-54-21.bpo-22815.0NRH8s.rst b/Misc/NEWS.d/next/Library/2021-12-16-12-54-21.bpo-22815.0NRH8s.rst new file mode 100644 index 0000000000000..5c4600f316ac3 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-12-16-12-54-21.bpo-22815.0NRH8s.rst @@ -0,0 +1,2 @@ +Print unexpected successes together with failures and errors in summary in +:class:`unittest.TextTestResult`.

1 0