[pypy-svn] r10375 - pypy/branch/pypy-normalize-exception/objspace/flow/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Apr  6 22:49:22 2005
New Revision: 10375

Modified:
   pypy/branch/pypy-normalize-exception/objspace/flow/test/test_objspace.py
Log:
Fixed or disabled tests -- 'raise' now produce quite a bit of code, can't
really check the shape of the graph...


Modified: pypy/branch/pypy-normalize-exception/objspace/flow/test/test_objspace.py
==============================================================================
--- pypy/branch/pypy-normalize-exception/objspace/flow/test/test_objspace.py	(original)
+++ pypy/branch/pypy-normalize-exception/objspace/flow/test/test_objspace.py	Wed Apr  6 22:49:22 2005
@@ -241,10 +241,14 @@
     def test_raise1(self):
         x = self.codetest(self.raise1)
         self.show(x)
-        assert len(x.startblock.operations) == 0
-        assert x.startblock.exits[0].args == [
-            Constant(IndexError),
-            Constant(None)]         # no normalization
+        simplify_graph(x)
+        ops = x.startblock.operations
+        assert len(ops) == 2
+        assert ops[0].opname == 'simple_call'
+        assert ops[0].args == [Constant(IndexError)]
+        assert ops[1].opname == 'type'
+        assert ops[1].args == [ops[0].result]
+        assert x.startblock.exits[0].args == [ops[1].result, ops[0].result]
         assert x.startblock.exits[0].target is x.exceptblock
 
     #__________________________________________________________
@@ -254,11 +258,7 @@
     def test_raise2(self):
         x = self.codetest(self.raise2)
         self.show(x)
-        assert len(x.startblock.operations) == 0
-        assert x.startblock.exits[0].args == [
-            Constant(IndexError),
-            x.startblock.inputargs[0]]
-        assert x.startblock.exits[0].target is x.exceptblock
+        # XXX can't check the shape of the graph, too complicated...
 
     #__________________________________________________________
     def raise3(msg):
@@ -267,16 +267,7 @@
     def test_raise3(self):
         x = self.codetest(self.raise3)
         self.show(x)
-        simplify_graph(x)
-        assert len(x.startblock.operations) == 1
-        assert x.startblock.operations[0].opname == 'simple_call'
-        assert list(x.startblock.operations[0].args) == [
-            Constant(IndexError),
-            x.startblock.inputargs[0]]
-        assert x.startblock.exits[0].args == [
-            Constant(IndexError),
-            x.startblock.operations[0].result]
-        assert x.startblock.exits[0].target is x.exceptblock
+        # XXX can't check the shape of the graph, too complicated...
 
     #__________________________________________________________
     def raise4(stuff):