From 2149d04006441a3469e19579d6e46524b561be6a3fb6321f29536b27c0818efa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20S=C3=BAkup?= Date: Fri, 19 Jul 2019 09:03:23 +0000 Subject: [PATCH] - refresh pytest4.patch for pytest5 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-apipkg?expand=0&rev=4 --- pytest4.patch | 31 ++++++++++++++++++++++++++++--- python-apipkg.changes | 5 +++++ 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pytest4.patch b/pytest4.patch index 92f3d67..8580b35 100644 --- a/pytest4.patch +++ b/pytest4.patch @@ -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 diff --git a/python-apipkg.changes b/python-apipkg.changes index e2d1eea..f954866 100644 --- a/python-apipkg.changes +++ b/python-apipkg.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jul 19 09:02:40 UTC 2019 - Ondřej Súkup + +- refresh pytest4.patch for pytest5 + ------------------------------------------------------------------- Tue Feb 12 14:15:58 UTC 2019 - Tomáš Chvátal