[pypy-svn] pypy pytest2: small fixes to the pypy test suite

[hpk42]

Author: holger krekel <holger at merlinux.eu>
Branch: pytest2
Changeset: r40861:183ecfddfdb5
Date: 2011-01-18 15:25 +0100
http://bitbucket.org/pypy/pypy/changeset/183ecfddfdb5/

Log:	small fixes to the pypy test suite

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -288,7 +288,7 @@
                     "generator app level functions? you must be joking"
                 return AppTestFunction(name, parent=self)
             elif obj.func_code.co_flags & 32: # generator function
-                return self.Generator(name, parent=self)
+                return pytest.Generator(name, parent=self)
             else:
                 return IntTestFunction(name, parent=self)
 

diff --git a/pypy/jit/backend/conftest.py b/pypy/jit/backend/conftest.py
--- a/pypy/jit/backend/conftest.py
+++ b/pypy/jit/backend/conftest.py
@@ -4,8 +4,6 @@
 """
 import py, random
 
-option = py.test.config.option
-
 def pytest_addoption(parser):
     group = parser.getgroup('random test options')
     group.addoption('--random-seed', action="store", type="int",