From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Sat, 15 Nov 2025 01:23:03 +0000 (+0100)
Subject: [3.13] gh-136442: Fix unittest to return exit code 5 when setUpClass raises an except... 
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fb7ae3fe83075abe913d0f29415b7eaa3ddf338b;p=thirdparty%2FPython%2Fcpython.git

[3.13] gh-136442: Fix unittest to return exit code 5 when setUpClass raises an exception (GH-136487) (#141577)

gh-136442: Fix unittest to return exit code 5 when setUpClass raises an exception (GH-136487)
(cherry picked from commit 53d65c840e038ce9a5782fbd3da963c7aba90570)

Co-authored-by: Takuya UESHIN <ueshin@happy-camper.st>
---

diff --git a/Lib/test/test_unittest/test_program.py b/Lib/test/test_unittest/test_program.py
index aa7e8b712fd7..d0432eb73117 100644
--- a/Lib/test/test_unittest/test_program.py
+++ b/Lib/test/test_unittest/test_program.py
@@ -75,6 +75,14 @@ class Test_TestProgram(unittest.TestCase):
     class Empty(unittest.TestCase):
         pass
 
+    class SetUpClassFailure(unittest.TestCase):
+        @classmethod
+        def setUpClass(cls):
+            super().setUpClass()
+            raise Exception
+        def testPass(self):
+            pass
+
     class TestLoader(unittest.TestLoader):
         """Test loader that returns a suite containing the supplied testcase."""
 
@@ -191,6 +199,18 @@ class Test_TestProgram(unittest.TestCase):
         out = stream.getvalue()
         self.assertIn('\nNO TESTS RAN\n', out)
 
+    def test_ExitSetUpClassFailureSuite(self):
+        stream = BufferedWriter()
+        with self.assertRaises(SystemExit) as cm:
+            unittest.main(
+                argv=["setup_class_failure"],
+                testRunner=unittest.TextTestRunner(stream=stream),
+                testLoader=self.TestLoader(self.SetUpClassFailure))
+        self.assertEqual(cm.exception.code, 1)
+        out = stream.getvalue()
+        self.assertIn("ERROR: setUpClass", out)
+        self.assertIn("SetUpClassFailure", out)
+
 
 class InitialisableProgram(unittest.TestProgram):
     exit = False
diff --git a/Lib/unittest/main.py b/Lib/unittest/main.py
index c3869de3f6f1..a0cd8a9f7ea4 100644
--- a/Lib/unittest/main.py
+++ b/Lib/unittest/main.py
@@ -269,12 +269,12 @@ class TestProgram(object):
             testRunner = self.testRunner
         self.result = testRunner.run(self.test)
         if self.exit:
-            if self.result.testsRun == 0 and len(self.result.skipped) == 0:
+            if not self.result.wasSuccessful():
+                sys.exit(1)
+            elif self.result.testsRun == 0 and len(self.result.skipped) == 0:
                 sys.exit(_NO_TESTS_EXITCODE)
-            elif self.result.wasSuccessful():
-                sys.exit(0)
             else:
-                sys.exit(1)
+                sys.exit(0)
 
 
 main = TestProgram
diff --git a/Misc/NEWS.d/next/Tests/2025-07-09-21-45-51.gh-issue-136442.jlbklP.rst b/Misc/NEWS.d/next/Tests/2025-07-09-21-45-51.gh-issue-136442.jlbklP.rst
new file mode 100644
index 000000000000..f87fb1113cad
--- /dev/null
+++ b/Misc/NEWS.d/next/Tests/2025-07-09-21-45-51.gh-issue-136442.jlbklP.rst
@@ -0,0 +1 @@
+Use exitcode ``1`` instead of ``5`` if :func:`unittest.TestCase.setUpClass` raises an exception