Author: Ronny Pfannschmidt <[email protected]>
Branch: pytest
Changeset: r60468:1d71a7df8c7f
Date: 2013-01-25 18:00 +0100
http://bitbucket.org/pypy/pypy/changeset/1d71a7df8c7f/
Log: kill more conftest.option uses
diff --git a/pypy/module/imp/test/test_import.py
b/pypy/module/imp/test/test_import.py
--- a/pypy/module/imp/test/test_import.py
+++ b/pypy/module/imp/test/test_import.py
@@ -13,7 +13,6 @@
from pypy.module.imp import importing
-from pypy import conftest
def setuppkg(pkgname, **entries):
p = udir.join('impsubdir')
@@ -93,7 +92,7 @@
# create compiled/x.py and a corresponding pyc file
p = setuppkg("compiled", x = "x = 84")
- if conftest.option.runappdirect:
+ if py.test.config.option.runappdirect:
import marshal, stat, struct, os, imp
code = py.code.Source(p.join("x.py").read()).compile()
s3 = marshal.dumps(code)
@@ -153,7 +152,7 @@
}
def setup_class(cls):
- cls.w_runappdirect = cls.space.wrap(conftest.option.runappdirect)
+ cls.w_runappdirect = cls.space.wrap(py.test.config.option.runappdirect)
cls.saved_modules = _setup(cls.space)
#XXX Compile class
diff --git a/pypy/objspace/std/test/test_bytearrayobject.py
b/pypy/objspace/std/test/test_bytearrayobject.py
--- a/pypy/objspace/std/test/test_bytearrayobject.py
+++ b/pypy/objspace/std/test/test_bytearrayobject.py
@@ -1,8 +1,8 @@
-from pypy import conftest
+import py
class AppTestBytesArray:
def setup_class(cls):
- cls.w_runappdirect = cls.space.wrap(conftest.option.runappdirect)
+ cls.w_runappdirect = cls.space.wrap(py.test.config.option.runappdirect)
def test_basics(self):
b = bytearray()
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
