Author: Alex Gaynor <[email protected]>
Branch:
Changeset: r59358:699f60d012f3
Date: 2012-12-06 21:20 -0800
http://bitbucket.org/pypy/pypy/changeset/699f60d012f3/
Log: Fixed bz2 tests
diff --git a/pypy/module/_ffi/test/test_struct.py
b/pypy/module/_ffi/test/test_struct.py
--- a/pypy/module/_ffi/test/test_struct.py
+++ b/pypy/module/_ffi/test/test_struct.py
@@ -54,7 +54,7 @@
lst = [array[i] for i in range(length)]
return space.wrap(lst)
if cls.runappdirect:
- cls.w_read_raw_mem = lambda self, addr, typename, length:
read_raw_mem(cls.space, addr, typename, length)
+ cls.w_read_raw_mem = lambda self, *args: read_raw_mem(cls.space,
*args)
else:
cls.w_read_raw_mem = cls.space.wrap(interp2app(read_raw_mem))
#
diff --git a/pypy/module/bz2/test/test_bz2_compdecomp.py
b/pypy/module/bz2/test/test_bz2_compdecomp.py
--- a/pypy/module/bz2/test/test_bz2_compdecomp.py
+++ b/pypy/module/bz2/test/test_bz2_compdecomp.py
@@ -46,7 +46,10 @@
def setup_class(cls):
cls.w_TEXT = cls.space.wrap(TEXT)
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
+ if cls.runappdirect:
+ cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
+ else:
+ cls.w_decompress = cls.space.wrap(interp2app(decompress))
cls.w_HUGE_OK = cls.space.wrap(HUGE_OK)
def test_creation(self):
@@ -184,7 +187,10 @@
def setup_class(cls):
cls.w_TEXT = cls.space.wrap(TEXT)
cls.w_DATA = cls.space.wrap(DATA)
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
+ if cls.runappdirect:
+ cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
+ else:
+ cls.w_decompress = cls.space.wrap(interp2app(decompress))
cls.w_HUGE_OK = cls.space.wrap(HUGE_OK)
def test_compress_function(self):
diff --git a/pypy/module/bz2/test/test_bz2_file.py
b/pypy/module/bz2/test/test_bz2_file.py
--- a/pypy/module/bz2/test/test_bz2_file.py
+++ b/pypy/module/bz2/test/test_bz2_file.py
@@ -66,10 +66,12 @@
str(py.test.ensuretemp("bz2").join("foo")))
if cls.runappdirect:
cls.w_create_temp_file = create_temp_file
+ cls.w_create_broken_temp_file = lambda self:
create_broken_temp_file()
+ cls.w_decompress = lambda self, *args: decompress(cls.space, *args)
else:
cls.w_create_temp_file =
cls.space.wrap(interp2app(create_temp_file))
- cls.w_decompress = cls.space.wrap(interp2app(decompress))
- cls.w_create_broken_temp_file =
cls.space.wrap(interp2app(create_broken_temp_file))
+ cls.w_create_broken_temp_file =
cls.space.wrap(interp2app(create_broken_temp_file))
+ cls.w_decompress = cls.space.wrap(interp2app(decompress))
cls.w_random_data = cls.space.wrap(RANDOM_DATA)
def test_attributes(self):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
