[pypy-svn] r4300 - pypy/trunk/src/pypy/translator/test

[arigo at codespeak.net]

Author: arigo
Date: Fri May  7 11:41:43 2004
New Revision: 4300

Modified:
   pypy/trunk/src/pypy/translator/test/snippet.py
   pypy/trunk/src/pypy/translator/test/test_annrpython.py
Log:
An extra test.

Modified: pypy/trunk/src/pypy/translator/test/snippet.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/snippet.py	(original)
+++ pypy/trunk/src/pypy/translator/test/snippet.py	Fri May  7 11:41:43 2004
@@ -288,6 +288,14 @@
     c.a = 2
     return c.a
 
+def merge_setattr(x):
+    if x:
+        c = C()
+        c.a = 1
+    else:
+        c = C()
+    return c.a
+
 class D(C): pass
 class E(C): pass
 

Modified: pypy/trunk/src/pypy/translator/test/test_annrpython.py
==============================================================================
--- pypy/trunk/src/pypy/translator/test/test_annrpython.py	(original)
+++ pypy/trunk/src/pypy/translator/test/test_annrpython.py	Fri May  7 11:41:43 2004
@@ -150,6 +150,14 @@
         # result should be an integer
         self.assertEquals(a.gettype(graph.getreturnvar()), int)
 
+    def test_merge_setattr(self):
+        translator = Translator(snippet.merge_setattr)
+        graph = translator.getflowgraph()
+        a = RPythonAnnotator(translator)
+        a.build_types(graph, [int])
+        # result should be an integer
+        self.assertEquals(a.gettype(graph.getreturnvar()), int)
+
     def test_inheritance1(self):
         translator = Translator(snippet.inheritance1)
         graph = translator.getflowgraph()