Author: Ronny Pfannschmidt <[email protected]>
Branch: pytest
Changeset: r60449:04895e55cede
Date: 2013-01-25 13:35 +0100
http://bitbucket.org/pypy/pypy/changeset/04895e55cede/
Log: a few more config.option fixes
diff --git a/pypy/module/_file/test/test_file.py
b/pypy/module/_file/test/test_file.py
--- a/pypy/module/_file/test/test_file.py
+++ b/pypy/module/_file/test/test_file.py
@@ -442,12 +442,12 @@
assert s == 'bar\n'
def test_flush_at_exit():
- from pypy import conftest
+ import py
from pypy.tool.option import make_config, make_objspace
from rpython.tool.udir import udir
tmpfile = udir.join('test_flush_at_exit')
- config = make_config(conftest.option)
+ config = make_config(py.test.config.option)
space = make_objspace(config)
space.appexec([space.wrap(str(tmpfile))], """(tmpfile):
f = open(tmpfile, 'w')
diff --git a/pypy/module/_io/test/test_fileio.py
b/pypy/module/_io/test/test_fileio.py
--- a/pypy/module/_io/test/test_fileio.py
+++ b/pypy/module/_io/test/test_fileio.py
@@ -1,5 +1,6 @@
from rpython.tool.udir import udir
import os
+import py
class AppTestFileIO:
spaceconfig = dict(usemodules=['_io'])
@@ -161,12 +162,11 @@
assert repr(f) == "<_io.FileIO [closed]>"
def test_flush_at_exit():
- from pypy import conftest
from pypy.tool.option import make_config, make_objspace
from rpython.tool.udir import udir
tmpfile = udir.join('test_flush_at_exit')
- config = make_config(conftest.option)
+ config = make_config(py.test.config.option)
space = make_objspace(config)
space.appexec([space.wrap(str(tmpfile))], """(tmpfile):
import io
@@ -182,7 +182,7 @@
from pypy import conftest
from pypy.tool.option import make_config, make_objspace
- config = make_config(conftest.option)
+ config = make_config(py.test.config.option)
space = make_objspace(config)
space.appexec([], """():
import io
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
