jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correctly initialize and shutdown sessions

This commit is contained in:
Benjamin Peterson 2011-05-26 17:08:44 -05:00
parent c4d761fe99
commit 89d6defd68
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
_pytest/pytester.py
View File

@ -6,7 +6,7 @@ import re
import inspect import inspect
import time import time
from fnmatch import fnmatch from fnmatch import fnmatch
from _pytest.main import Session from _pytest.main import Session, EXIT_OK
from py.builtin import print_ from py.builtin import print_
from _pytest.core import HookRelay from _pytest.core import HookRelay
@ -292,13 +292,19 @@ class TmpTestdir:
assert '::' not in str(arg) assert '::' not in str(arg)
p = py.path.local(arg) p = py.path.local(arg)
x = session.fspath.bestrelpath(p) x = session.fspath.bestrelpath(p)
return session.perform_collect([x], genitems=False)[0] config.hook.pytest_sessionstart(session=session)
res = session.perform_collect([x], genitems=False)[0]
config.hook.pytest_sessionfinish(session=session, exitstatus=EXIT_OK)
return res
def getpathnode(self, path): def getpathnode(self, path):
config = self.parseconfig(path) config = self.parseconfig(path)
session = Session(config) session = Session(config)
x = session.fspath.bestrelpath(path) x = session.fspath.bestrelpath(path)
return session.perform_collect([x], genitems=False)[0] config.hook.pytest_sessionstart(session=session)
res = session.perform_collect([x], genitems=False)[0]
config.hook.pytest_sessionfinish(session=session, exitstatus=EXIT_OK)
return res
def genitems(self, colitems): def genitems(self, colitems):
session = colitems[0].session session = colitems[0].session
@ -312,7 +318,9 @@ class TmpTestdir:
config = self.parseconfigure(*args) config = self.parseconfigure(*args)
rec = self.getreportrecorder(config) rec = self.getreportrecorder(config)
session = Session(config) session = Session(config)
config.hook.pytest_sessionstart(session=session)
session.perform_collect() session.perform_collect()
config.hook.pytest_sessionfinish(session=session, exitstatus=EXIT_OK)
return session.items, rec return session.items, rec
def runitem(self, source): def runitem(self, source):