[pypy-svn] r12292 - pypy/dist/lib-python/modified-2.3.4/test

[arigo at codespeak.net]

Author: arigo
Date: Sun May 15 15:52:32 2005
New Revision: 12292

Modified:
   pypy/dist/lib-python/modified-2.3.4/test/test_descr.py
Log:
Fixes to strange tests.


Modified: pypy/dist/lib-python/modified-2.3.4/test/test_descr.py
==============================================================================
--- pypy/dist/lib-python/modified-2.3.4/test/test_descr.py	(original)
+++ pypy/dist/lib-python/modified-2.3.4/test/test_descr.py	Sun May 15 15:52:32 2005
@@ -20,7 +20,7 @@
     m = getattr(t, meth)
     while meth not in t.__dict__:
         t = t.__bases__[0]
-    vereq(m, t.__dict__[meth])
+    vereq(t.__dict__[meth](a), res)
     vereq(m(a), res)
     bm = getattr(a, meth)
     vereq(bm(), res)
@@ -38,7 +38,7 @@
     m = getattr(t, meth)
     while meth not in t.__dict__:
         t = t.__bases__[0]
-    vereq(m, t.__dict__[meth])
+    vereq(t.__dict__[meth](a, b), res)
     vereq(m(a, b), res)
     bm = getattr(a, meth)
     vereq(bm(b), res)
@@ -362,8 +362,8 @@
         pass
 
     # Two essentially featureless objects, just inheriting stuff from
-    # object.
-    vereq(dir(None), dir(Ellipsis))
+    # object.  NB. in PyPy, dir(None) additionally contains '__nonzero__'.
+    vereq(dir(object()), dir(Ellipsis))
 
     # Nasty test case for proxied objects
     class Wrapper(object):