[pypy-svn] pypy simplify-conftest: Progress: it's no more necessary to call cleanup_references() from every test
amauryfa
commits-noreply at bitbucket.org
Mon Jan 10 16:30:24 CET 2011
Author: Amaury Forgeot d'Arc <amauryfa at gmail.com>
Branch: simplify-conftest
Changeset: r40557:7c56e85131ff
Date: 2011-01-10 14:36 +0100
http://bitbucket.org/pypy/pypy/changeset/7c56e85131ff/
Log: Progress: it's no more necessary to call cleanup_references() from
every test
diff --git a/pypy/module/cpyext/test/test_datetime.py b/pypy/module/cpyext/test/test_datetime.py
--- a/pypy/module/cpyext/test/test_datetime.py
+++ b/pypy/module/cpyext/test/test_datetime.py
@@ -108,4 +108,3 @@
datetime.time,
datetime.timedelta)
module.clear_types()
- self.cleanup_references()
diff --git a/pypy/module/cpyext/test/test_structseq.py b/pypy/module/cpyext/test/test_structseq.py
--- a/pypy/module/cpyext/test/test_structseq.py
+++ b/pypy/module/cpyext/test/test_structseq.py
@@ -47,4 +47,3 @@
assert 'hello' in s
assert 'other' not in s
del s
- self.cleanup_references()
diff --git a/pypy/module/cpyext/test/test_cpyext.py b/pypy/module/cpyext/test/test_cpyext.py
--- a/pypy/module/cpyext/test/test_cpyext.py
+++ b/pypy/module/cpyext/test/test_cpyext.py
@@ -165,8 +165,6 @@
state = cls.space.fromcache(RefcountState)
state.non_heaptypes_w[:] = []
- cls.w_cleanup_references = cls.space.wrap(interp2app(cls.cleanup_references))
-
def compile_module(self, name, **kwds):
"""
Build an extension module linked against the cpyext api library.
diff --git a/pypy/module/cpyext/test/test_arraymodule.py b/pypy/module/cpyext/test/test_arraymodule.py
--- a/pypy/module/cpyext/test/test_arraymodule.py
+++ b/pypy/module/cpyext/test/test_arraymodule.py
@@ -14,7 +14,6 @@
arr.append(4)
assert arr.tolist() == [1, 2, 3, 4]
assert len(arr) == 4
- self.cleanup_references()
def test_iter(self):
module = self.import_module(name='array')
@@ -23,7 +22,6 @@
for i in arr:
sum += i
assert sum == 6
- self.cleanup_references()
def test_index(self):
module = self.import_module(name='array')
@@ -34,7 +32,6 @@
assert arr.tolist() == [1,2,4]
arr[2] = 99
assert arr.tolist() == [1,2,99]
- self.cleanup_references()
def test_slice_get(self):
module = self.import_module(name='array')
@@ -43,4 +40,3 @@
assert arr[1:].tolist() == [2,3,4]
assert arr[:2].tolist() == [1,2]
assert arr[1:3].tolist() == [2,3]
- self.cleanup_references()
diff --git a/pypy/module/cpyext/test/test_typeobject.py b/pypy/module/cpyext/test/test_typeobject.py
--- a/pypy/module/cpyext/test/test_typeobject.py
+++ b/pypy/module/cpyext/test/test_typeobject.py
@@ -20,7 +20,6 @@
assert type(obj) is module.fooType
print "type of obj has type", type(type(obj))
print "type of type of obj has type", type(type(type(obj)))
- self.cleanup_references()
def test_typeobject_method_descriptor(self):
module = self.import_module(name='foo')
@@ -39,7 +38,6 @@
print obj.foo
assert obj.foo == 42
assert obj.int_member == obj.foo
- self.cleanup_references()
def test_typeobject_data_member(self):
module = self.import_module(name='foo')
@@ -56,7 +54,6 @@
raises(SystemError, "obj.broken_member = 42")
assert module.fooType.broken_member.__doc__ is None
assert module.fooType.object_member.__doc__ == "A Python object."
- self.cleanup_references()
def test_typeobject_object_member(self):
module = self.import_module(name='foo')
@@ -77,7 +74,6 @@
obj.set_foo = 32
assert obj.foo == 32
- self.cleanup_references()
def test_typeobject_string_member(self):
module = self.import_module(name='foo')
@@ -111,7 +107,6 @@
obj.longlong_member = -2**59; assert obj.longlong_member == -2**59
obj.ulonglong_member = 2**63; assert obj.ulonglong_member == 2**63
#
- self.cleanup_references()
def test_staticmethod(self):
module = self.import_module(name="foo")
@@ -119,7 +114,6 @@
assert obj.foo == 42
obj2 = obj.create()
assert obj2.foo == 42
- self.cleanup_references()
def test_new(self):
module = self.import_module(name='foo')
@@ -140,7 +134,6 @@
return self
assert fuu2(u"abc").baz().escape()
raises(TypeError, module.fooType.object_member.__get__, 1)
- self.cleanup_references()
def test_init(self):
module = self.import_module(name="foo")
@@ -160,7 +153,6 @@
newobj = Fuu2()
assert newobj.get_val() == 42
assert newobj.foobar == 32
- self.cleanup_references()
def test_metatype(self):
module = self.import_module(name='foo')
@@ -169,7 +161,6 @@
assert isinstance(x, type)
assert isinstance(x, module.MetaType)
x()
- self.cleanup_references()
def test_metaclass_compatible(self):
# metaclasses should not conflict here
@@ -180,7 +171,6 @@
assert isinstance(y, module.MetaType)
x = y()
del x, y
- self.cleanup_references()
def test_sre(self):
module = self.import_module(name='_sre')
@@ -200,19 +190,16 @@
re._cache.clear()
re._cache_repl.clear()
del prog, m
- self.cleanup_references()
def test_init_error(self):
module = self.import_module("foo")
raises(ValueError, module.InitErrType)
- self.cleanup_references()
def test_cmps(self):
module = self.import_module("comparisons")
cmpr = module.CmpType()
assert cmpr == 3
assert cmpr != 42
- self.cleanup_references()
def test_hash(self):
module = self.import_module("comparisons")
@@ -222,7 +209,6 @@
d[cmpr] = 72
assert d[cmpr] == 72
assert d[3] == 72
- self.cleanup_references()
def test_descriptor(self):
module = self.import_module("foo")
@@ -237,7 +223,6 @@
assert obj.y == (prop, 2)
del obj.x
assert obj.z == prop
- self.cleanup_references()
def test_tp_dict(self):
foo = self.import_module("foo")
@@ -259,7 +244,6 @@
])
obj = foo.new()
assert module.read_tp_dict(obj) == foo.fooType.copy
- self.cleanup_references()
class TestTypes(BaseApiTest):
More information about the Pypy-commit
mailing list