gh-113267: Revert "gh-106584: Fix exit code for unittest in Python 3.… · aisk/cpython@9d44784 · GitHub

1. aisk
2. cpython

Repository navigation

• Code
• Pull requests
• Projects
• Security and quality
• Insights

Commit 9d44784

Browse filesBrowse the repository at this point in the historyBrowse files

serhiy-storchaka

authored and

aisk

committed

pythongh-113267: Revert "pythongh-106584: Fix exit code for unittest in Python 3.12 (python#106588)" (pythonGH-114470)

This reverts commit 8fc0713.

1 parent 233e5fd commit 9d44784
Copy full SHA for 9d44784

5 files changed

+14-16Lines changed: 14 additions & 16 deletions

File tree

Expand file treeCollapse file tree

Open diff view settings

Filter options

• Lib
  • test/test_unittest
    • test_discovery.py
    • test_skipping.py
  • unittest
    • case.py
    • result.py
• Misc/NEWS.d/next/Library
  • 2024-01-23-11-04-21.gh-issue-113267.xe_Pxe.rst

Expand file treeCollapse file tree

Open diff view settings

Collapse file

‎Lib/test/test_unittest/test_discovery.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_unittest/test_discovery.py

+1-1Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
@@ -571,7 +571,7 @@ def _get_module_from_name(name):
571	571	result = unittest.TestResult()
572	572	suite.run(result)
573	573	self.assertEqual(len(result.skipped), 1)
574		- self.assertEqual(result.testsRun, 0)
	574	+ self.assertEqual(result.testsRun, 1)
575	575	self.assertEqual(import_calls, ['my_package'])
576	576
577	577	# Check picklability

Collapse file

‎Lib/test/test_unittest/test_skipping.py‎

Copy file name to clipboardExpand all lines: Lib/test/test_unittest/test_skipping.py

+6-6Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -103,16 +103,16 @@ def test_dont_skip(self): pass
103	103	result = LoggingResult(events)
104	104	self.assertIs(suite.run(result), result)
105	105	self.assertEqual(len(result.skipped), 1)
106		- expected = ['addSkip', 'stopTest', 'startTest',
107		- 'addSuccess', 'stopTest']
	106	+ expected = ['startTest', 'addSkip', 'stopTest',
	107	+ 'startTest', 'addSuccess', 'stopTest']
108	108	self.assertEqual(events, expected)
109		- self.assertEqual(result.testsRun, 1)
	109	+ self.assertEqual(result.testsRun, 2)
110	110	self.assertEqual(result.skipped, [(test_do_skip, "testing")])
111	111	self.assertTrue(result.wasSuccessful())
112	112
113	113	events = []
114	114	result = test_do_skip.run()
115		- self.assertEqual(events, ['startTestRun', 'addSkip',
	115	+ self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
116	116	'stopTest', 'stopTestRun'])
117	117	self.assertEqual(result.skipped, [(test_do_skip, "testing")])
118	118
@@ -135,13 +135,13 @@ def test_1(self):
135	135	test = Foo("test_1")
136	136	suite = unittest.TestSuite([test])
137	137	self.assertIs(suite.run(result), result)
138		- self.assertEqual(events, ['addSkip', 'stopTest'])
	138	+ self.assertEqual(events, ['startTest', 'addSkip', 'stopTest'])
139	139	self.assertEqual(result.skipped, [(test, "testing")])
140	140	self.assertEqual(record, [])
141	141
142	142	events = []
143	143	result = test.run()
144		- self.assertEqual(events, ['startTestRun', 'addSkip',
	144	+ self.assertEqual(events, ['startTestRun', 'startTest', 'addSkip',
145	145	'stopTest', 'stopTestRun'])
146	146	self.assertEqual(result.skipped, [(test, "testing")])
147	147	self.assertEqual(record, [])

Collapse file

‎Lib/unittest/case.py‎

Copy file name to clipboardExpand all lines: Lib/unittest/case.py

+1-3Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
@@ -606,6 +606,7 @@ def run(self, result=None):
606	606	else:
607	607	stopTestRun = None
608	608
	609	+ result.startTest(self)
609	610	try:
610	611	testMethod = getattr(self, self._testMethodName)
611	612	if (getattr(self.__class__, "__unittest_skip__", False) or
@@ -616,9 +617,6 @@ def run(self, result=None):
616	617	_addSkip(result, self, skip_why)
617	618	return result
618	619
619		- # Increase the number of tests only if it hasn't been skipped
620		- result.startTest(self)
621		-
622	620	expecting_failure = (
623	621	getattr(self, "__unittest_expecting_failure__", False) or
624	622	getattr(testMethod, "__unittest_expecting_failure__", False)

Collapse file

‎Lib/unittest/result.py‎

Copy file name to clipboardExpand all lines: Lib/unittest/result.py

+4-6Lines changed: 4 additions & 6 deletions

Original file line number	Diff line number	Diff line change
@@ -97,12 +97,10 @@ def _restoreStdout(self):
97	97
98	98	sys.stdout = self._original_stdout
99	99	sys.stderr = self._original_stderr
100		- if self._stdout_buffer is not None:
101		- self._stdout_buffer.seek(0)
102		- self._stdout_buffer.truncate()
103		- if self._stderr_buffer is not None:
104		- self._stderr_buffer.seek(0)
105		- self._stderr_buffer.truncate()
	100	+ self._stdout_buffer.seek(0)
	101	+ self._stdout_buffer.truncate()
	102	+ self._stderr_buffer.seek(0)
	103	+ self._stderr_buffer.truncate()
106	104
107	105	def stopTestRun(self):
108	106	"""Called once after all tests are executed.

Collapse file

‎Misc/NEWS.d/next/Library/2024-01-23-11-04-21.gh-issue-113267.xe_Pxe.rst‎

Copy file name to clipboard

+2Lines changed: 2 additions & 0 deletions

• Display the source diff
• Display the rich diff

Original file line number	Diff line number	Diff line change
@@ -0,0 +1,2 @@
	1	+ Revert changes in :gh:`106584` which made calls of ``TestResult`` methods
	2	+ ``startTest()`` and ``stopTest()`` unbalanced.

0 commit comments

Comments

0 (0)