- refresh pytest4.patch for pytest5

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-apipkg?expand=0&rev=4
This commit is contained in:
Ondřej Súkup 2019-07-19 09:03:23 +00:00 committed by Git OBS Bridge
parent cee0eb30bc
commit 563342ba3f
2 changed files with 33 additions and 3 deletions

View File

@ -1,6 +1,8 @@
--- a/test_apipkg.py
+++ b/test_apipkg.py
@@ -13,7 +13,7 @@
Index: apipkg-1.5/test_apipkg.py
===================================================================
--- apipkg-1.5.orig/test_apipkg.py
+++ apipkg-1.5/test_apipkg.py
@@ -13,7 +13,7 @@ ModuleType = types.ModuleType
class TestRealModule:
def setup_class(cls):
@ -9,3 +11,26 @@
sys.path = [str(cls.tmpdir)] + sys.path
pkgdir = cls.tmpdir.ensure('realtest', dir=1)
@@ -319,8 +319,10 @@ def test_error_loading_one_element(monke
import errorloading1
assert isinstance(errorloading1, apipkg.ApiModule)
assert errorloading1.y == 0
- py.test.raises(ImportError, 'errorloading1.x')
- py.test.raises(ImportError, 'errorloading1.x')
+ with pytest.raises(ImportError):
+ errorloading1.x
+ with pytest.raises(ImportError):
+ errorloading1.x
def test_onfirstaccess(tmpdir, monkeypatch):
@@ -493,7 +495,8 @@ def test_aliasmodule_proxy_methods(tmpdi
assert doit is orig.doit
del proxy.doit
- py.test.raises(AttributeError, "orig.doit")
+ with pytest.raises(AttributeError):
+ orig.doit
proxy.doit = doit
assert orig.doit is doit

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 19 09:02:40 UTC 2019 - Ondřej Súkup <mimi.vx@gmail.com>
- refresh pytest4.patch for pytest5
-------------------------------------------------------------------
Tue Feb 12 14:15:58 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>