From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> Date: Wed, 24 Jun 2026 16:50:36 +0000 (+0200) Subject: [3.13] Re-raise unexpected exceptions instead of swallowing them in various tests... X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bc690c4b5fbf27bfd43232926cd088df97f503ce;p=thirdparty%2FPython%2Fcpython.git [3.13] Re-raise unexpected exceptions instead of swallowing them in various tests (GH-152019) (#152104) (cherry picked from commit 6c3da17d1f333f6bd4c07d11e2e304159d550822) Co-authored-by: An Long Co-authored-by: Stan Ulbrych --- diff --git a/Lib/test/test_fcntl.py b/Lib/test/test_fcntl.py index 0570257c5230..fe2a4b8ad12a 100644 --- a/Lib/test/test_fcntl.py +++ b/Lib/test/test_fcntl.py @@ -151,6 +151,7 @@ class TestFcntl(unittest.TestCase): except OSError as exc: if exc.errno == errno.EINVAL: self.skipTest("F_NOTIFY not available by this environment") + raise fcntl.fcntl(fd, cmd, flags) finally: os.close(fd) diff --git a/Lib/test/test_launcher.py b/Lib/test/test_launcher.py index b2ca8cf2140a..46466ecf2cd9 100644 --- a/Lib/test/test_launcher.py +++ b/Lib/test/test_launcher.py @@ -469,6 +469,7 @@ class TestLauncher(unittest.TestCase, RunPyMixin): except subprocess.CalledProcessError: if not is_installed("2.7"): raise unittest.SkipTest("requires at least one Python 2.x install") + raise self.assertEqual("PythonCore", data["env.company"]) self.assertTrue(data["env.tag"].startswith("2."), data["env.tag"]) diff --git a/Lib/test/test_pathlib/test_pathlib.py b/Lib/test/test_pathlib/test_pathlib.py index aa2498f7e085..be8e4dc09aaa 100644 --- a/Lib/test/test_pathlib/test_pathlib.py +++ b/Lib/test/test_pathlib/test_pathlib.py @@ -1109,6 +1109,7 @@ class PathTest(test_pathlib_abc.DummyPathTest, PurePathTest): if (isinstance(e, PermissionError) or "AF_UNIX path too long" in str(e)): self.skipTest("cannot bind Unix socket: " + str(e)) + raise self.assertTrue(P.is_socket()) self.assertFalse(P.is_fifo()) self.assertFalse(P.is_file()) diff --git a/Lib/test/test_socket.py b/Lib/test/test_socket.py index 342e1e037322..66e02023cac9 100644 --- a/Lib/test/test_socket.py +++ b/Lib/test/test_socket.py @@ -1409,6 +1409,7 @@ class GeneralModuleTests(unittest.TestCase): except OSError as e: if e.winerror == 10022: self.skipTest('IPv6 might not be supported') + raise f = lambda a: inet_pton(AF_INET6, a) assertInvalid = lambda a: self.assertRaises( @@ -1499,6 +1500,7 @@ class GeneralModuleTests(unittest.TestCase): except OSError as e: if e.winerror == 10022: self.skipTest('IPv6 might not be supported') + raise f = lambda a: inet_ntop(AF_INET6, a) assertInvalid = lambda a: self.assertRaises(