From 3651d112fe646e00888af8ce387a3ff9493b4a29 Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 22 May 2024 20:00:51 -0400 Subject: [PATCH] marge-bot: unbreak by disabling erroring test (cherry picked from commit cdd08e06925ef64a9d4f351a0829d94981e41323) --- pkgs/by-name/ma/marge-bot/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index b564622271d3..8964ce72264b 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { }; postPatch = '' - substituteInPlace setup.cfg --replace "--flake8 --pylint --cov=marge" "" + substituteInPlace setup.cfg --replace-fail "--flake8 --pylint --cov=marge" "" ''; nativeBuildInputs = [ @@ -30,12 +30,17 @@ python3.pkgs.buildPythonApplication rec { requests ]; - nativeCheckInputs = with python3.pkgs; [ pytestCheckHook ]; + nativeCheckInputs = with python3.pkgs; [ pytestCheckHook pendulum ]; disabledTests = [ # test broken when run under Nix: # "unittest.mock.InvalidSpecError: Cannot spec a Mock object." "test_get_mr_ci_status" ]; + disabledTestPaths = [ + # test errors due to API mismatch in test setup: + # "ImportError: cannot import name 'set_test_now' from 'pendulum.helpers'" + "tests/test_interval.py" + ]; pythonImportsCheck = [ "marge" ];