Author: Alex Gaynor <alex.gay...@gmail.com>
Branch: kill-faking
Changeset: r59233:53f78807d4b1
Date: 2012-12-02 13:32 -0800
http://bitbucket.org/pypy/pypy/changeset/53f78807d4b1/
Log: fix a bunch of tests
diff --git a/pypy/module/imp/test/test_app.py b/pypy/module/imp/test/test_app.py
--- a/pypy/module/imp/test/test_app.py
+++ b/pypy/module/imp/test/test_app.py
@@ -1,8 +1,11 @@
from __future__ import with_statement
MARKER = 42
+
class AppTestImpModule:
- spaceconfig = dict(usemodules=('imp', 'itertools'))
+ spaceconfig = {
+ "usemodules": ['imp', 'itertools', 'binascii', 'rctime'],
+ }
def setup_class(cls):
cls.w_imp = cls.space.getbuiltinmodule('imp')
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
@@ -139,23 +139,25 @@
def _teardown(space, w_saved_modules):
space.appexec([w_saved_modules], """
- ((saved_path, saved_modules)):
+ ((saved_path, saved_modules)):
import sys
sys.path[:] = saved_path
sys.modules.clear()
sys.modules.update(saved_modules)
""")
+
class AppTestImport:
- spaceconfig = dict(usemodules=['_md5'])
+ spaceconfig = {
+ "usemodules": ['_md5', 'rctime'],
+ }
- def setup_class(cls): # interpreter-level
+ def setup_class(cls):
cls.w_runappdirect = cls.space.wrap(conftest.option.runappdirect)
cls.saved_modules = _setup(cls.space)
#XXX Compile class
-
- def teardown_class(cls): # interpreter-level
+ def teardown_class(cls):
_teardown(cls.space, cls.saved_modules)
def test_set_sys_modules_during_import(self):
@@ -992,19 +994,22 @@
extrapath.join("urllib.py").write("print 42\n")
old = os.environ.get('PYTHONPATH', None)
oldlang = os.environ.pop('LANG', None)
- try:
+ try:
os.environ['PYTHONPATH'] = str(extrapath)
- output = py.process.cmdexec('''"%s" "%s" -c "import urllib"''' %
- (sys.executable, pypypath) )
- assert output.strip() == '42'
- finally:
- if old:
- os.environ['PYTHONPATH'] = old
+ output = py.process.cmdexec('''"%s" "%s" -c "import urllib"''' %
+ (sys.executable, pypypath))
+ assert output.strip() == '42'
+ finally:
+ if old:
+ os.environ['PYTHONPATH'] = old
if oldlang:
os.environ['LANG'] = oldlang
+
class AppTestImportHooks(object):
- spaceconfig = dict(usemodules=('struct', 'itertools'))
+ spaceconfig = {
+ "usemodules": ['struct', 'itertools', 'rctime'],
+ }
def setup_class(cls):
mydir = os.path.dirname(__file__)
@@ -1145,7 +1150,7 @@
sys.path_hooks.append(ImpWrapper)
sys.path_importer_cache.clear()
try:
- mnames = ("colorsys", "urlparse", "distutils.core",
"compiler.misc")
+ mnames = ("colorsys", "urlparse", "email.mime", "compiler.misc")
for mname in mnames:
parent = mname.split(".")[0]
for n in sys.modules.keys():
diff --git a/pypy/module/itertools/test/test_itertools.py
b/pypy/module/itertools/test/test_itertools.py
--- a/pypy/module/itertools/test/test_itertools.py
+++ b/pypy/module/itertools/test/test_itertools.py
@@ -912,7 +912,9 @@
class AppTestItertools27:
- spaceconfig = dict(usemodules=['itertools', 'struct'])
+ spaceconfig = {
+ "usemodules": ['itertools', 'struct', 'binascii'],
+ }
def setup_class(cls):
if cls.space.is_true(cls.space.appexec([], """():
diff --git a/pypy/module/micronumpy/test/test_complex.py
b/pypy/module/micronumpy/test/test_complex.py
--- a/pypy/module/micronumpy/test/test_complex.py
+++ b/pypy/module/micronumpy/test/test_complex.py
@@ -1,13 +1,16 @@
from __future__ import with_statement
+
import sys
+
+from pypy.conftest import option
+from pypy.interpreter.error import OperationError
+from pypy.interpreter.gateway import interp2app
from pypy.module.micronumpy.test.test_base import BaseNumpyAppTest
from pypy.rlib.rfloat import isnan, isinf, copysign
from pypy.rlib.rcomplex import c_pow
-from pypy.interpreter.error import OperationError
-from pypy.conftest import option
-def rAlmostEqual(a, b, rel_err = 2e-15, abs_err = 5e-323, msg='',
isnumpy=False):
+def rAlmostEqual(a, b, rel_err=2e-15, abs_err=5e-323, msg='', isnumpy=False):
"""Fail if the two floating-point numbers are not almost equal.
Determine whether floating-point values a and b are equal to within
@@ -90,23 +93,31 @@
fname64 = os.path.join(os.path.dirname(__file__),
'complex64_testcases.txt')
cls.w_testcases128 = cls.space.wrap(list(parse_testfile(fname128)))
cls.w_testcases64 = cls.space.wrap(list(parse_testfile(fname64)))
- def cls_c_pow(self, *args):
+
+ def cls_c_pow(space, args_w):
try:
- retVal = c_pow(*args)
- return retVal
+ retVal = c_pow(*map(space.unwrap, args_w))
+ return space.wrap(retVal)
except ValueError, e:
if option.runappdirect:
raise
raise OperationError(cls.space.w_ValueError,
cls.space.wrap(e.message))
- cls.w_c_pow = cls.space.wrap(cls_c_pow)
+ cls.w_c_pow = cls.space.wrap(interp2app(cls_c_pow))
cls.w_runAppDirect = cls.space.wrap(option.runappdirect)
cls.w_isWindows = cls.space.wrap(os.name == 'nt')
- def cls_rAlmostEqual(self, *args, **kwargs):
+
+ def cls_rAlmostEqual(space, __args__):
+ args, kwargs = __args__.unpack()
+ args = map(space.unwrap, args)
+ kwargs = dict([
+ (k, space.unwrap(v))
+ for k, v in kwargs.iteritems()
+ ])
if '__pypy__' not in sys.builtin_module_names:
kwargs['isnumpy'] = True
- return rAlmostEqual(*args, **kwargs)
- cls.w_rAlmostEqual = cls.space.wrap(cls_rAlmostEqual)
+ return space.wrap(rAlmostEqual(*args, **kwargs))
+ cls.w_rAlmostEqual = cls.space.wrap(interp2app(cls_rAlmostEqual))
def test_fabs(self):
from _numpypy import fabs, complex128
diff --git a/pypy/module/posix/test/test_posix2.py
b/pypy/module/posix/test/test_posix2.py
--- a/pypy/module/posix/test/test_posix2.py
+++ b/pypy/module/posix/test/test_posix2.py
@@ -48,7 +48,12 @@
GET_POSIX = "(): import %s as m ; return m" % os.name
+
class AppTestPosix:
+ spaceconfig = {
+ "usemodules": ["binascii", "struct"],
+ }
+
def setup_class(cls):
cls.space = space
cls.w_posix = space.appexec([], GET_POSIX)
diff --git a/pypy/module/select/test/test_select.py
b/pypy/module/select/test/test_select.py
--- a/pypy/module/select/test/test_select.py
+++ b/pypy/module/select/test/test_select.py
@@ -225,9 +225,12 @@
readend.close()
writeend.close()
+
class AppTestSelectWithPipes(_AppTestSelect):
"Use a pipe to get pairs of file descriptors"
- spaceconfig = dict(usemodules=["select"])
+ spaceconfig = {
+ "usemodules": ["select", "rctime"]
+ }
def setup_class(cls):
if sys.platform == 'win32':
diff --git a/pypy/module/sys/test/test_sysmodule.py
b/pypy/module/sys/test/test_sysmodule.py
--- a/pypy/module/sys/test/test_sysmodule.py
+++ b/pypy/module/sys/test/test_sysmodule.py
@@ -538,8 +538,8 @@
# be changed.
assert sys.float_repr_style == "short"
+
class AppTestCurrentFrames:
-
def test_current_frames(self):
try:
import thread
@@ -555,8 +555,11 @@
assert frames.keys() == [0]
assert frames[0].f_code.co_name in ('f', '?')
+
class AppTestCurrentFramesWithThread(AppTestCurrentFrames):
- spaceconfig = dict(usemodules=('thread',))
+ spaceconfig = {
+ "usemodules": ["rctime", "thread"],
+ }
def test_current_frames(self):
import sys
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
