11
0

- Add patch to play with new pytest rather than restricting:

* pytest4.patch

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python:pytest/python-execnet?expand=0&rev=8
This commit is contained in:
Tomáš Chvátal
2019-07-19 09:16:27 +00:00
committed by Git OBS Bridge
parent 40ffffba77
commit 5329aaf214
3 changed files with 34 additions and 3 deletions

24
pytest4.patch Normal file
View File

@@ -0,0 +1,24 @@
Index: execnet-1.6.0/testing/conftest.py
===================================================================
--- execnet-1.6.0.orig/testing/conftest.py
+++ execnet-1.6.0/testing/conftest.py
@@ -83,8 +83,8 @@ def getsocketspec(config=None):
def pytest_generate_tests(metafunc):
- if 'gw' in metafunc.funcargnames:
- assert 'anypython' not in metafunc.funcargnames, "need combine?"
+ if 'gw' in metafunc.fixturenames:
+ assert 'anypython' not in metafunc.fixturenames, "need combine?"
if hasattr(metafunc.function, 'gwtypes'):
gwtypes = metafunc.function.gwtypes
elif hasattr(metafunc.cls, 'gwtype'):
@@ -92,7 +92,7 @@ def pytest_generate_tests(metafunc):
else:
gwtypes = ['popen', 'socket', 'ssh', 'proxy']
metafunc.parametrize("gw", gwtypes, indirect=True)
- elif 'anypython' in metafunc.funcargnames:
+ elif 'anypython' in metafunc.fixturenames:
metafunc.parametrize(
"anypython", indirect=True, argvalues=(
'sys.executable', 'python2.7', 'pypy', 'jython',