forked from pool/python-pytest-instafail
- Add patch to fix build with pytest 4.2+:
* pytest42.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-pytest-instafail?expand=0&rev=7
This commit is contained in:
committed by
Git OBS Bridge
parent
941fb93588
commit
b9e4233498
31
pytest42.patch
Normal file
31
pytest42.patch
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
From eb4ff5e5cf1811ebde34e070520142647c907726 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Daniel Hahler <git@thequod.de>
|
||||||
|
Date: Thu, 14 Feb 2019 17:12:51 +0100
|
||||||
|
Subject: [PATCH] print_failure: fix compatibility with pytest 4.2
|
||||||
|
|
||||||
|
Fixes https://github.com/pytest-dev/pytest-instafail/issues/14.
|
||||||
|
---
|
||||||
|
pytest_instafail.py | 8 +++++---
|
||||||
|
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/pytest_instafail.py b/pytest_instafail.py
|
||||||
|
index 495f901..1a4530c 100644
|
||||||
|
--- a/pytest_instafail.py
|
||||||
|
+++ b/pytest_instafail.py
|
||||||
|
@@ -76,11 +76,13 @@ def print_failure(self, report):
|
||||||
|
self.write_line(line)
|
||||||
|
else:
|
||||||
|
msg = self._getfailureheadline(report)
|
||||||
|
- if not hasattr(report, 'when'):
|
||||||
|
+ # "when" was unset before pytest 4.2 for collection errors.
|
||||||
|
+ when = getattr(report, "when", "collect")
|
||||||
|
+ if when == "collect":
|
||||||
|
msg = "ERROR collecting " + msg
|
||||||
|
- elif report.when == "setup":
|
||||||
|
+ elif when == "setup":
|
||||||
|
msg = "ERROR at setup of " + msg
|
||||||
|
- elif report.when == "teardown":
|
||||||
|
+ elif when == "teardown":
|
||||||
|
msg = "ERROR at teardown of " + msg
|
||||||
|
self.write_sep("_", msg)
|
||||||
|
if not self.config.getvalue("usepdb"):
|
||||||
@@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 15 09:11:23 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Add patch to fix build with pytest 4.2+:
|
||||||
|
* pytest42.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Feb 14 14:10:32 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
Thu Feb 14 14:10:32 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ License: BSD-2-Clause
|
|||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
URL: https://github.com/jpvanhal/pytest-instafail
|
URL: https://github.com/jpvanhal/pytest-instafail
|
||||||
Source: https://files.pythonhosted.org/packages/source/p/pytest-instafail/pytest-instafail-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/p/pytest-instafail/pytest-instafail-%{version}.tar.gz
|
||||||
BuildRequires: %{python_module devel}
|
Patch0: pytest42.patch
|
||||||
BuildRequires: %{python_module setuptools}
|
BuildRequires: %{python_module setuptools}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
@@ -43,6 +43,7 @@ until the end of test session.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n pytest-instafail-%{version}
|
%setup -q -n pytest-instafail-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%python_build
|
||||||
|
|||||||
Reference in New Issue
Block a user