[pypy-svn] r61773 - pypy/trunk/lib-python/modified-2.5.2/test

[getxsick at codespeak.net]

Author: getxsick
Date: Thu Feb 12 12:02:25 2009
New Revision: 61773

Modified:
   pypy/trunk/lib-python/modified-2.5.2/test/test_dis.py
Log:
(jlg, getxsick) remove unnecessary difference between cpython and pypy test


Modified: pypy/trunk/lib-python/modified-2.5.2/test/test_dis.py
==============================================================================
--- pypy/trunk/lib-python/modified-2.5.2/test/test_dis.py	(original)
+++ pypy/trunk/lib-python/modified-2.5.2/test/test_dis.py	Thu Feb 12 12:02:25 2009
@@ -12,7 +12,7 @@
     print a
     return 1
 
-dis_f_cpy = """\
+dis_f = """\
  %-4d         0 LOAD_FAST                0 (a)
               3 PRINT_ITEM
               4 PRINT_NEWLINE
@@ -22,17 +22,6 @@
 """%(_f.func_code.co_firstlineno + 1,
      _f.func_code.co_firstlineno + 2)
 
-dis_f_pypy = """\
- %-4d         0 LOAD_FAST                0 (a)
-              3 PRINT_ITEM
-              4 PRINT_NEWLINE
-
- %-4d         5 LOAD_CONST               1 (1)
-              8 RETURN_VALUE
-"""%(_f.func_code.co_firstlineno + 1,
-     _f.func_code.co_firstlineno + 2)
-
-
 def bug708901():
     for res in range(1,
                      10):
@@ -131,10 +120,7 @@
         self.assertEqual(dis.opmap["STORE_NAME"], dis.HAVE_ARGUMENT)
 
     def test_dis(self):
-        if check_impl_detail(pypy=True):
-            self.do_disassembly_test(_f, dis_f_pypy)
-        else:
-            self.do_disassembly_test(_f, dis_f_cpy)
+        self.do_disassembly_test(_f, dis_f)
 
     @impl_detail("PyPy compilers produce different opcodes")
     def test_bug_708901(self):