[py-svn] r38568 - in py/trunk/py/test: . testing
hpk at codespeak.net
hpk at codespeak.net
Mon Feb 12 15:58:15 CET 2007
Author: hpk
Date: Mon Feb 12 15:58:14 2007
New Revision: 38568
Modified:
py/trunk/py/test/collect.py
py/trunk/py/test/testing/test_config.py
Log:
improving r38560 a bit
Modified: py/trunk/py/test/collect.py
==============================================================================
--- py/trunk/py/test/collect.py (original)
+++ py/trunk/py/test/collect.py Mon Feb 12 15:58:14 2007
@@ -65,10 +65,8 @@
return "<%s %r>" %(self.__class__.__name__, self.name)
def __eq__(self, other):
- #try:
- # return self.name == other.name and self.parent == other.parent
- #except AttributeError:
- # return False
+ # XXX a rather strict check for now to not confuse
+ # the SetupState.prepare() logic
return self is other
def __hash__(self):
@@ -359,7 +357,7 @@
if res is None:
attr = getattr(self.obj, name, None)
if attr is not None:
- return self.makeitem(name, attr, usefilters=False)
+ res = self.makeitem(name, attr, usefilters=False)
return res
def startcapture(self):
Modified: py/trunk/py/test/testing/test_config.py
==============================================================================
--- py/trunk/py/test/testing/test_config.py (original)
+++ py/trunk/py/test/testing/test_config.py Mon Feb 12 15:58:14 2007
@@ -397,8 +397,7 @@
assert trail[0] == a.relto(config.topdir)
assert trail[1] == ('trail.py',)
col2 = config._getcollector(trail)
- assert [i.name for i in col2.listchain()] == \
- [i.name for i in col.listchain()]
+ assert col2.listnames() == col.listnames()
def test_get_collector_trail_topdir_and_beyond(self):
config = py.test.config._reparse([self.tmpdir])
More information about the pytest-commit
mailing list