[pypy-svn] r58800 - pypy/branch/2.5-merge/lib-python

[hpk at codespeak.net]

Author: hpk
Date: Wed Oct  8 13:14:38 2008
New Revision: 58800

Modified:
   pypy/branch/2.5-merge/lib-python/conftest.py
Log:
(pedronis,hpk) correctly fix the setup/teardown problem


Modified: pypy/branch/2.5-merge/lib-python/conftest.py
==============================================================================
--- pypy/branch/2.5-merge/lib-python/conftest.py	(original)
+++ pypy/branch/2.5-merge/lib-python/conftest.py	Wed Oct  8 13:14:38 2008
@@ -67,11 +67,6 @@
         self.core = core
         assert self.getfspath().check(), "%r not found!" % (basename,)
 
-    def setup(self):
-        pass
-    def teardown(self):
-        pass
-
     def usemodules(self):
         return self._usemodules #+ pypy_option.usemodules
     usemodules = property(usemodules)
@@ -581,7 +576,7 @@
 
 Directory = RegrDirectory
 
-class RunFileExternal(py.test.collect.Module): 
+class RunFileExternal(py.test.collect.File):
     def __init__(self, name, parent, regrtest): 
         super(RunFileExternal, self).__init__(name, parent) 
         self.regrtest = regrtest