unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed

blob 039816b7809efa78588dc81f2d69916ae8efce6a 810 bytes (raw)
name: gnu/packages/patches/python-chardet-3.0.4-pytest.patch 	 # note: path name is non-authoritative(*)

From 440828f8faafdb58700c64a9ea8f6a30b154c08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 11 Nov 2019 21:02:51 +0100
Subject: [PATCH] Support pytest 4, don't apply marks directly to parameters
 (#174)

Fixes https://github.com/chardet/chardet/issues/173
---
 test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.py b/test.py
index 9833307..ad2b753 100644
--- a/test.py
+++ b/test.py
@@ -59,7 +59,7 @@ def gen_test_params():
             full_path = join(path, file_name)
             test_case = full_path, encoding
             if full_path in EXPECTED_FAILURES:
-                test_case = pytest.mark.xfail(test_case)
+                test_case = pytest.param(*test_case, marks=pytest.mark.xfail)
             yield test_case
 
 

debug log:

solving 039816b780 ...
found 039816b780 in https://yhetil.org/guix-patches/20201007073234.GA6057@zpidnp36/

applying [1/1] https://yhetil.org/guix-patches/20201007073234.GA6057@zpidnp36/
diff --git a/gnu/packages/patches/python-chardet-3.0.4-pytest.patch b/gnu/packages/patches/python-chardet-3.0.4-pytest.patch
new file mode 100644
index 0000000000..039816b780

1:29: trailing whitespace.
 
1:30: trailing whitespace.
 
Checking patch gnu/packages/patches/python-chardet-3.0.4-pytest.patch...
1:29: new blank line at EOF.
+
Applied patch gnu/packages/patches/python-chardet-3.0.4-pytest.patch cleanly.
warning: 3 lines add whitespace errors.

index at:
100644 039816b7809efa78588dc81f2d69916ae8efce6a	gnu/packages/patches/python-chardet-3.0.4-pytest.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).