[pypy-svn] rev 2429 - pypy/trunk/src/pypy/module/test

[pmaupin at codespeak.net]

Author: pmaupin
Date: Wed Dec 17 13:52:37 2003
New Revision: 2429

Modified:
   pypy/trunk/src/pypy/module/test/test_builtin.py
Log:
Sped up and cleaned up some tests

Modified: pypy/trunk/src/pypy/module/test/test_builtin.py
==============================================================================
--- pypy/trunk/src/pypy/module/test/test_builtin.py	(original)
+++ pypy/trunk/src/pypy/module/test/test_builtin.py	Wed Dec 17 13:52:37 2003
@@ -20,33 +20,30 @@
         d = {"foo":"bar"}
         exec "def f(): return globals()" in d
         d2 = d["f"]()
-        self.assertEquals(d2.keys(),d.keys())
-        # repr() on recursive containers currently fails
-        #self.assertEquals(d2,d)
-        self.assertEquals(d==d2,1)
+        self.assertEquals(d2,d)
 
     def test_locals(self):
         def f():
             return locals()
-        def g(x=11):
+        def g(c=0, b=0, a=0):
             return locals()
         self.assertEquals(f(), {})
-        self.assertEquals(g(), {'x':11})
+        self.assertEquals(g(), {'a':0, 'b':0, 'c':0})
         
     def test_dir(self):
         def f():
             return dir()
-        self.assertEquals(f(), [])
         def g(c=0, b=0, a=0):
             return dir()
+        self.assertEquals(f(), [])
         self.assertEquals(g(), ['a', 'b', 'c'])
 
     def test_vars(self):
         def f():
             return vars()
-        self.assertEquals(f(), {})
         def g(c=0, b=0, a=0):
             return vars()
+        self.assertEquals(f(), {})
         self.assertEquals(g(), {'a':0, 'b':0, 'c':0})
         
     def test_getattr(self):
@@ -83,9 +80,11 @@
             def __call__(self):
                 self.value += 1
                 return self.value
-        self.assertRaises(TypeError,iter,3,5)
-        self.assertRaises(TypeError,iter,[],5)
-        self.assertRaises(TypeError,iter,{},5)
+        # XXX Raising errors is quite slow -- 
+        #            uncomment these lines when fixed
+        #self.assertRaises(TypeError,iter,3,5)
+        #self.assertRaises(TypeError,iter,[],5)
+        #self.assertRaises(TypeError,iter,{},5)
         x = iter(count(),3)
         self.assertEquals(x.next(),1)
         self.assertEquals(x.next(),2)