Commits

Ronny Pfannschmidt  committed 8ffe18b

kill usage of pypy.conftest.option

  • Participants
  • Parent commits 152b03a
  • Branches pytest

Comments (0)

Files changed (2)

File pypy/conftest.py

             if spaceconfig is not None:
                 from pypy.tool.pytest.objspace import gettestobjspace
                 appclass.obj.space = gettestobjspace(**spaceconfig)
-            appclass.obj.runappdirect = option.runappdirect
+            appclass.obj.runappdirect = item.config.option.runappdirect
 
     __multicall__.execute()
 

File pypy/tool/pytest/objspace.py

 from rpython.config.config import ConflictConfigError
 from pypy.tool.option import make_config, make_objspace
 from pypy.tool.pytest import appsupport
-from pypy.conftest import option
 
 _SPACECACHE={}
+
+
 def gettestobjspace(**kwds):
     """ helper for instantiating and caching space's for testing.
     """
+    option = py.test.config.option
     try:
         config = make_config(option,**kwds)
     except ConflictConfigError, e:
 
 def maketestobjspace(config=None):
     if config is None:
-        config = make_config(option)
+        config = make_config(py.test.config.option)
     space = make_objspace(config)
     space.startup() # Initialize all builtin modules
     space.setitem(space.builtin.w_dict, space.wrap('AssertionError'),