[pypy-svn] pypy jitypes2: Fix test_logger.py.

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jitypes2
Changeset: r42894:e6cce505ab63
Date: 2011-03-24 10:05 +0100
http://bitbucket.org/pypy/pypy/changeset/e6cce505ab63/

Log:	Fix test_logger.py.

diff --git a/pypy/jit/metainterp/logger.py b/pypy/jit/metainterp/logger.py
--- a/pypy/jit/metainterp/logger.py
+++ b/pypy/jit/metainterp/logger.py
@@ -48,10 +48,14 @@
     def _log_operations(self, inputargs, operations):
         if not have_debug_prints():
             return None
-        logops = LogOperations(self.metainterp_sd, self.guard_number)
+        logops = self._make_log_operations()
         logops.log_operations(inputargs, operations)
         return logops
 
+    def _make_log_operations(self):
+        # hook for tests
+        return LogOperations(self.metainterp_sd, self.guard_number)
+
 
 class LogOperations(object):
     """

diff --git a/pypy/jit/metainterp/test/test_logger.py b/pypy/jit/metainterp/test/test_logger.py
--- a/pypy/jit/metainterp/test/test_logger.py
+++ b/pypy/jit/metainterp/test/test_logger.py
@@ -36,11 +36,16 @@
         return capturing(logger.Logger.log_loop, self,
                          loop.inputargs, loop.operations)
 
-    def repr_of_descr(self, descr):
-        for k, v in self.namespace.items():
-            if v == descr:
-                return k
-        return descr.repr_of_descr()
+    def _make_log_operations(self1):
+        class LogOperations(logger.LogOperations):
+            def repr_of_descr(self, descr):
+                for k, v in self1.namespace.items():
+                    if v == descr:
+                        return k
+                return descr.repr_of_descr()
+        logops = LogOperations(self1.metainterp_sd, self1.guard_number)
+        self1.logops = logops
+        return logops
 
 class TestLogger(object):
     ts = llhelper
@@ -188,4 +193,4 @@
         '''
         logger, loop, _ = self.reparse(inp)
         op = loop.operations[1]
-        assert logger.repr_of_op(op) == "i8 = int_add(i6, 3)"
+        assert logger.logops.repr_of_op(op) == "i8 = int_add(i6, 3)"