IQ.Lvbs/pytest-xdist
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adapt for changed py-trunk, new outcome exceptions

Browse Source
This commit is contained in:
holger krekel
2010-04-27 21:16:47 +02:00
parent bd254674f9
commit b6cdbf46a6
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
testing/test_dsession.py
View File

@@ -1,5 +1,5 @@
from xdist.dsession import DSession from xdist.dsession import DSession
from py._test import outcome from py._test import session as outcome
import py import py
import execnet import execnet

23
xdist/dsession.py
View File

@@ -1,6 +1,5 @@
import py import py
from py._test.session import Session from py._test import session
from py._test import outcome
from xdist.nodemanage import NodeManager from xdist.nodemanage import NodeManager
queue = py.builtin._tryimport('queue', 'Queue') queue = py.builtin._tryimport('queue', 'Queue')
@@ -62,7 +61,7 @@ class LoopState(object):
class ExitFirstInterrupt(KeyboardInterrupt): class ExitFirstInterrupt(KeyboardInterrupt):
pass pass
class DSession(Session): class DSession(session.Session):
""" """
Session drives the collection and running of tests Session drives the collection and running of tests
and generates test events for reporters. and generates test events for reporters.
@@ -140,7 +139,7 @@ class DSession(Session):
self.triggershutdown() self.triggershutdown()
loopstate.shuttingdown = True loopstate.shuttingdown = True
if not self.node2pending: if not self.node2pending:
loopstate.exitstatus = outcome.EXIT_NOHOSTS loopstate.exitstatus = session.EXIT_NOHOSTS
def loop_once_shutdown(self, loopstate): def loop_once_shutdown(self, loopstate):
# once we are in shutdown mode we dont send # once we are in shutdown mode we dont send
@@ -154,16 +153,16 @@ class DSession(Session):
self.config.hook.pytest_runtest_logreport(**kwargs) self.config.hook.pytest_runtest_logreport(**kwargs)
elif eventname == "pytest_internalerror": elif eventname == "pytest_internalerror":
self.config.hook.pytest_internalerror(**kwargs) self.config.hook.pytest_internalerror(**kwargs)
loopstate.exitstatus = outcome.EXIT_INTERNALERROR loopstate.exitstatus = session.EXIT_INTERNALERROR
elif eventname == "pytest__teardown_final_logerror": elif eventname == "pytest__teardown_final_logerror":
self.config.hook.pytest__teardown_final_logerror(**kwargs) self.config.hook.pytest__teardown_final_logerror(**kwargs)
loopstate.exitstatus = outcome.EXIT_TESTSFAILED loopstate.exitstatus = session.EXIT_TESTSFAILED
if not self.node2pending: if not self.node2pending:
# finished # finished
if loopstate.testsfailed: if loopstate.testsfailed:
loopstate.exitstatus = outcome.EXIT_TESTSFAILED loopstate.exitstatus = session.EXIT_TESTSFAILED
else: else:
loopstate.exitstatus = outcome.EXIT_OK loopstate.exitstatus = session.EXIT_OK
#self.config.pluginmanager.unregister(loopstate) #self.config.pluginmanager.unregister(loopstate)
def _initloopstate(self, colitems): def _initloopstate(self, colitems):
@@ -183,16 +182,16 @@ class DSession(Session):
except KeyboardInterrupt: except KeyboardInterrupt:
excinfo = py.code.ExceptionInfo() excinfo = py.code.ExceptionInfo()
if excinfo.errisinstance(ExitFirstInterrupt): if excinfo.errisinstance(ExitFirstInterrupt):
exitstatus = outcome.EXIT_TESTSFAILED exitstatus = session.EXIT_TESTSFAILED
else: else:
self.config.hook.pytest_keyboard_interrupt(excinfo=excinfo) self.config.hook.pytest_keyboard_interrupt(excinfo=excinfo)
exitstatus = outcome.EXIT_INTERRUPTED exitstatus = session.EXIT_INTERRUPTED
except: except:
self.config.pluginmanager.notify_exception() self.config.pluginmanager.notify_exception()
exitstatus = outcome.EXIT_INTERNALERROR exitstatus = session.EXIT_INTERNALERROR
self.config.pluginmanager.unregister(loopstate) self.config.pluginmanager.unregister(loopstate)
if exitstatus == 0 and self._testsfailed: if exitstatus == 0 and self._testsfailed:
exitstatus = outcome.EXIT_TESTSFAILED exitstatus = session.EXIT_TESTSFAILED
return exitstatus return exitstatus
def triggershutdown(self): def triggershutdown(self):