[svn r62245] fixed more wrong renames, fine-tuning

--HG--
branch : trunk
This commit is contained in:
hpk 2009-02-27 16:46:00 +01:00
parent 27110ea361
commit 82044fd873
3 changed files with 6 additions and 9 deletions

View File

@ -1,5 +1,3 @@
from __future__ import generators
import py
from conftesthandle import Conftest
@ -159,19 +157,19 @@ class Config(object):
def initsession(self):
""" return an initialized session object. """
cls = self._getestdirclass()
cls = self._getsessionclass()
session = cls(self)
session.fixoptions()
return session
def _getestdirclass(self):
def _getsessionclass(self):
""" return Session class determined from cmdline options
and looked up in initial config modules.
"""
if self.option.session is not None:
return self._conftest.rget(self.option.session)
else:
name = self._getestdirname()
name = self._getsessionname()
try:
return self._conftest.rget(name)
except KeyError:
@ -180,7 +178,7 @@ class Config(object):
mod = __import__(importpath, None, None, '__doc__')
return getattr(mod, name)
def _getestdirname(self):
def _getsessionname(self):
""" return default session name as determined from options. """
if self.option.collectonly:
name = 'Session'

View File

@ -31,11 +31,10 @@ class LooponfailingSession(Session):
while 1:
self.loop_once(loopstate)
if not loopstate.colitems and loopstate.wasfailing:
continue # rerun immediately
continue # the last failures passed, let's rerun all
self.statrecorder.waitonchange(checkinterval=2.0)
except KeyboardInterrupt:
print
pass
def loop_once(self, loopstate):
colitems = loopstate.colitems

View File

@ -120,4 +120,4 @@ def importplugin(importspec):
try:
return __import__("py.__.test.plugin.%s" %(importspec), None, None, '__doc__')
except ImportError:
raise ImportError(importspec)
return __import__(importspec) # show the original exception