p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

slightly simplify collection node init

This commit is contained in:
holger krekel 2010-11-01 01:01:31 +01:00
parent c3ec2718a2
commit cf8dd64703
5 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pytest/__init__.py
View File

@ -5,7 +5,7 @@ see http://pytest.org for documentation and details
(c) Holger Krekel and others, 2004-2010 (c) Holger Krekel and others, 2004-2010
""" """
__version__ = '2.0.0.dev12' __version__ = '2.0.0.dev14'
__all__ = ['config', 'cmdline'] __all__ = ['config', 'cmdline']

1
pytest/plugin/pytester.py
View File

@ -275,6 +275,7 @@ class TmpTestdir:
p.ensure("__init__.py") p.ensure("__init__.py")
return p return p
Collection = Collection
def getnode(self, config, arg): def getnode(self, config, arg):
collection = Collection(config) collection = Collection(config)
return collection.getbyid(collection._normalizearg(arg))[0] return collection.getbyid(collection._normalizearg(arg))[0]

2
pytest/plugin/session.py
View File

@ -324,7 +324,7 @@ class Node(object):
self.config = config or parent.config self.config = config or parent.config
#: the collection this node is part of. #: the collection this node is part of.
self.collection = collection or getattr(parent, 'collection', None) self.collection = collection or parent.collection
#: the file where this item is contained/collected from. #: the file where this item is contained/collected from.
self.fspath = getattr(parent, 'fspath', None) self.fspath = getattr(parent, 'fspath', None)

2
setup.py
View File

@ -22,7 +22,7 @@ def main():
name='pytest', name='pytest',
description='py.test: simple powerful testing with Python', description='py.test: simple powerful testing with Python',
long_description = long_description, long_description = long_description,
version='2.0.0.dev12', version='2.0.0.dev14',
url='http://pytest.org', url='http://pytest.org',
license='MIT license', license='MIT license',
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'], platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],

14
testing/plugin/test_python.py
View File

@ -5,7 +5,10 @@ class TestModule:
def test_module_file_not_found(self, testdir): def test_module_file_not_found(self, testdir):
tmpdir = testdir.tmpdir tmpdir = testdir.tmpdir
fn = tmpdir.join('nada','no') fn = tmpdir.join('nada','no')
col = py.test.collect.Module(fn, config=testdir.Config()) config=testdir.Config()
config.args = ["hello"]
col = py.test.collect.Module(fn, config=config,
collection=testdir.Collection(config))
col.config = testdir.parseconfig(tmpdir) col.config = testdir.parseconfig(tmpdir)
py.test.raises(py.error.ENOENT, col.collect) py.test.raises(py.error.ENOENT, col.collect)
@ -212,14 +215,15 @@ class TestFunction:
def test_function_equality(self, testdir, tmpdir): def test_function_equality(self, testdir, tmpdir):
config = testdir.reparseconfig() config = testdir.reparseconfig()
collection = testdir.Collection(config)
f1 = py.test.collect.Function(name="name", config=config, f1 = py.test.collect.Function(name="name", config=config,
args=(1,), callobj=isinstance) args=(1,), callobj=isinstance, collection=collection)
f2 = py.test.collect.Function(name="name",config=config, f2 = py.test.collect.Function(name="name",config=config,
args=(1,), callobj=py.builtin.callable) args=(1,), callobj=py.builtin.callable, collection=collection)
assert not f1 == f2 assert not f1 == f2
assert f1 != f2 assert f1 != f2
f3 = py.test.collect.Function(name="name", config=config, f3 = py.test.collect.Function(name="name", config=config,
args=(1,2), callobj=py.builtin.callable) args=(1,2), callobj=py.builtin.callable, collection=collection)
assert not f3 == f2 assert not f3 == f2
assert f3 != f2 assert f3 != f2
@ -227,7 +231,7 @@ class TestFunction:
assert f3 != f1 assert f3 != f1
f1_b = py.test.collect.Function(name="name", config=config, f1_b = py.test.collect.Function(name="name", config=config,
args=(1,), callobj=isinstance) args=(1,), callobj=isinstance, collection=collection)
assert f1 == f1_b assert f1 == f1_b
assert not f1 != f1_b assert not f1 != f1_b