mbakke pushed a commit to branch master
in repository guix.

commit b62737097ca6c68bead5ae4e27d5098bb03e09cd
Author: Marius Bakke <[email protected]>
AuthorDate: Fri Jan 21 20:38:15 2022 +0100

    gnu: python-pytest-mock: Cope with test warnings.
    
    * gnu/packages/check.scm (python-pytest-mock)[source](modules, snippet): New
    fields.
    [arguments]: Increase test verbosity and remove obsolete workaround.
---
 gnu/packages/check.scm | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 8b90929b4b..481c0332cd 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -25,7 +25,7 @@
 ;;; Copyright © 2017, 2019 Kei Kebreau <[email protected]>
 ;;; Copyright © 2017 Nikita <[email protected]>
 ;;; Copyright © 2015, 2017, 2018, 2020, 2021 Ricardo Wurmus 
<[email protected]>
-;;; Copyright © 2016, 2017, 2018, 2019, 2020, 2021 Marius Bakke 
<[email protected]>
+;;; Copyright © 2016-2022 Marius Bakke <[email protected]>
 ;;; Copyright © 2017, 2018, 2020, 2021 Ludovic Courtès <[email protected]>
 ;;; Copyright © 2018 Fis Trivial <[email protected]>
 ;;; Copyright © 2019, 2021 Pierre Langlois <[email protected]>
@@ -1286,22 +1286,29 @@ reported in a previous test run.")
      (origin
        (method url-fetch)
        (uri (pypi-uri "pytest-mock" version))
-       (sha256 (base32
-                "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0"))))
+       (sha256
+        (base32 "0qhfmd05z3g88bnwq6644jl6p5wy01i4yy7h8883z9jjih2pl8a0"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; Some tests do a string match on Pytest output, and fails when
+        ;; warnings are present.  Adjust to cope with warnings from
+        ;; third-party libraries (looking at you, pytest-asyncio).
+        '(substitute* "tests/test_pytest_mock.py"
+           (("1 passed in \\*")
+            "1 passed*")))))
     (build-system python-build-system)
     (arguments
-     `(#:phases
+     '(#:phases
        (modify-phases %standard-phases
          (replace 'check
-           (lambda* (#:key inputs outputs tests? #:allow-other-keys)
+           (lambda* (#:key tests? #:allow-other-keys)
              (when tests?
-               (add-installed-pythonpath inputs outputs)
                ;; Skip the assertion rewriting tests, which don't work in the
                ;; presence of read-only Python modules (a limitation of
                ;; Pytest).  Also skip the "test_standalone_mock" test, which
                ;; can only work when 'python-mock' is not available
                ;; (currently propagated by Pytest 5).
-               (invoke "pytest" "--assert=plain"
+               (invoke "pytest" "--assert=plain" "-vv"
                        "-k" "not test_standalone_mock")))))))
     (native-inputs
      (list python-pytest-asyncio python-setuptools-scm))

Reply via email to