floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small refinements/precision regarding execnet checks 

--HG--
branch : trunk
This commit is contained in:
holger krekel 2009-11-23 17:25:46 +01:00
parent ed03eef81b
commit 79a9a99d1e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
py/impl/test/looponfail/remote.py
View File

@ -54,7 +54,7 @@ class RemoteControl(object):
py.builtin.print_("RemoteControl:", msg) py.builtin.print_("RemoteControl:", msg)
def initgateway(self): def initgateway(self):
return execnet.PopenGateway() return execnet.makegateway("popen")
def setup(self, out=None): def setup(self, out=None):
if out is None: if out is None:

5
py/plugin/pytest_default.py
View File

@ -7,6 +7,9 @@ try:
import execnet import execnet
except ImportError: except ImportError:
execnet = None execnet = None
else:
if not hasattr(execnet, 'Group'):
execnet = None
def pytest_pyfunc_call(__multicall__, pyfuncitem): def pytest_pyfunc_call(__multicall__, pyfuncitem):
if not __multicall__.execute(): if not __multicall__.execute():
@ -70,7 +73,7 @@ def pytest_addoption(parser):
add_dist_options(parser) add_dist_options(parser)
else: else:
parser.epilog = ( parser.epilog = (
"'execnet' package required for --looponfailing / distributed testing.") "'execnet>=1.0.0b4' package required for --looponfailing / distributed testing.")
def add_dist_options(parser): def add_dist_options(parser):
# see http://pytest.org/help/dist") # see http://pytest.org/help/dist")