commit: 0cab29013151c36d1c13b1b2ab67e864653b6134 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Sun Oct 26 10:22:43 2025 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Sun Oct 26 10:29:57 2025 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=0cab2901
Enable remaining tests previously skipped for python 3.14 Bug: https://bugs.gentoo.org/957070 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/tests/ebuild/test_ipc_daemon.py | 7 +------ lib/portage/tests/util/futures/test_retry.py | 20 +------------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/lib/portage/tests/ebuild/test_ipc_daemon.py b/lib/portage/tests/ebuild/test_ipc_daemon.py index ed8fc3a328..3646681e2b 100644 --- a/lib/portage/tests/ebuild/test_ipc_daemon.py +++ b/lib/portage/tests/ebuild/test_ipc_daemon.py @@ -1,10 +1,8 @@ -# Copyright 2010-2024 Gentoo Authors +# Copyright 2010-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import tempfile -import sys import time -import pytest from portage import os from portage import shutil from portage import _python_interpreter @@ -26,9 +24,6 @@ from _emerge.EbuildIpcDaemon import EbuildIpcDaemon class IpcDaemonTestCase(TestCase): _SCHEDULE_TIMEOUT = 40 # seconds - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testIpcDaemon(self): event_loop = global_event_loop() tmpdir = tempfile.mkdtemp() diff --git a/lib/portage/tests/util/futures/test_retry.py b/lib/portage/tests/util/futures/test_retry.py index 2b820dd0d4..9fe18fe555 100644 --- a/lib/portage/tests/util/futures/test_retry.py +++ b/lib/portage/tests/util/futures/test_retry.py @@ -1,17 +1,14 @@ -# Copyright 2018-2024 Gentoo Authors +# Copyright 2018-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 from concurrent.futures import Future, ThreadPoolExecutor import contextlib -import sys import threading import weakref import time -import pytest - from portage.tests import TestCase from portage.util._eventloop.global_event_loop import global_event_loop from portage.util.backoff import RandomExponentialBackoff @@ -115,9 +112,6 @@ class RetryTestCase(TestCase): self.assertEqual(len(done), 1) self.assertTrue(isinstance(done.pop().exception(), SucceedNeverException)) - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testHangForever(self): loop = global_event_loop() with self._wrap_coroutine_func(HangForever()) as func_coroutine: @@ -135,9 +129,6 @@ class RetryTestCase(TestCase): isinstance(done.pop().exception().__cause__, asyncio.TimeoutError) ) - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testHangForeverReraise(self): loop = global_event_loop() with self._wrap_coroutine_func(HangForever()) as func_coroutine: @@ -154,9 +145,6 @@ class RetryTestCase(TestCase): self.assertEqual(len(done), 1) self.assertTrue(isinstance(done.pop().exception(), asyncio.TimeoutError)) - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testCancelRetry(self): loop = global_event_loop() with self._wrap_coroutine_func(SucceedNever()) as func_coroutine: @@ -171,9 +159,6 @@ class RetryTestCase(TestCase): self.assertEqual(len(done), 1) self.assertTrue(done.pop().cancelled()) - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testOverallTimeoutWithException(self): loop = global_event_loop() with self._wrap_coroutine_func(SucceedNever()) as func_coroutine: @@ -196,9 +181,6 @@ class RetryTestCase(TestCase): msg=f"Cause was {cause.__class__.__name__}", ) - @pytest.mark.skipif( - sys.version_info >= (3, 14), reason="fails with python 3.14.0a3" - ) def testOverallTimeoutWithTimeoutError(self): loop = global_event_loop() # results in TimeoutError because it hangs forever
