diff --git a/pkgs/development/python-modules/oslo-concurrency/default.nix b/pkgs/development/python-modules/oslo-concurrency/default.nix index e9244c7bc843..d36546dde389 100644 --- a/pkgs/development/python-modules/oslo-concurrency/default.nix +++ b/pkgs/development/python-modules/oslo-concurrency/default.nix @@ -15,9 +15,11 @@ oslo-utils, oslotest, pbr, + pythonAtLeast, setuptools, stdenv, stestr, + writeText, }: buildPythonPackage rec { @@ -64,22 +66,36 @@ buildPythonPackage rec { stestr ]; - checkPhase = '' - echo "nameserver 127.0.0.1" > resolv.conf - export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + checkPhase = + let + disabledTests = [ + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn" + "oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally" + "oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist" + "oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size" + ] + ++ lib.optionals (pythonAtLeast "3.14") [ + # Disable test incompatible with Python 3.14+ + # See proposed change upstream: https://review.opendev.org/c/openstack/oslo.concurrency/+/971765 + "oslo_concurrency.tests.unit.test_lockutils" + ]; + in + '' + runHook preCheck - stestr run -e <(echo " - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_fair_lock_with_spawn_n - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn - oslo_concurrency.tests.unit.test_lockutils_eventlet.TestInternalLock.test_lock_with_spawn_n - ${lib.optionalString stdenv.hostPlatform.isDarwin '' - oslo_concurrency.tests.unit.test_lockutils.FileBasedLockingTestCase.test_interprocess_nonblocking_external_lock - oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally - oslo_concurrency.tests.unit.test_lockutils.LockTestCase.test_lock_externally_lock_dir_not_exist - oslo_concurrency.tests.unit.test_processutils.PrlimitTestCase.test_stack_size - ''}") - ''; + echo "nameserver 127.0.0.1" > resolv.conf + export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/resolv.conf=$(realpath resolv.conf) + + stestr run -e <(echo "${lib.concatStringsSep "\n" disabledTests}") + + runHook postCheck + ''; pythonImportsCheck = [ "oslo_concurrency" ];