[pypy-svn] r68873 - in pypy/branch/logging2/pypy/translator/c: src test

[arigo at codespeak.net]

Author: arigo
Date: Fri Oct 30 18:55:02 2009
New Revision: 68873

Modified:
   pypy/branch/logging2/pypy/translator/c/src/debug.h
   pypy/branch/logging2/pypy/translator/c/test/test_standalone.py
Log:
Test and fix.


Modified: pypy/branch/logging2/pypy/translator/c/src/debug.h
==============================================================================
--- pypy/branch/logging2/pypy/translator/c/src/debug.h	(original)
+++ pypy/branch/logging2/pypy/translator/c/src/debug.h	Fri Oct 30 18:55:02 2009
@@ -125,10 +125,10 @@
 
 void pypy_debug_start(const char *category)
 {
+  pypy_debug_ensure_opened();
   if (debug_profile)
     {
       /* profiling version */
-      pypy_debug_ensure_opened();
       pypy_ignoring_nested_prints++;    /* disable nested debug_print */
     }
   else
@@ -140,7 +140,6 @@
           pypy_ignoring_nested_prints++;
           return;
         }
-      pypy_debug_ensure_opened();
       if (!debug_prefix || !startswith(category, debug_prefix))
         {
           /* wrong section name, or no PYPYLOG at all, skip it */

Modified: pypy/branch/logging2/pypy/translator/c/test/test_standalone.py
==============================================================================
--- pypy/branch/logging2/pypy/translator/c/test/test_standalone.py	(original)
+++ pypy/branch/logging2/pypy/translator/c/test/test_standalone.py	Fri Oct 30 18:55:02 2009
@@ -259,8 +259,6 @@
     def test_debug_print_start_stop(self):
         def entry_point(argv):
             x = "got:"
-            if have_debug_prints(): x += "a"
-            debug_print("toplevel")
             debug_start  ("mycat")
             if have_debug_prints(): x += "b"
             debug_print    ("foo", 2, "bar", 3)
@@ -271,6 +269,8 @@
             if have_debug_prints(): x += "d"
             debug_print    ("bok")
             debug_stop   ("mycat")
+            if have_debug_prints(): x += "a"
+            debug_print("toplevel")
             os.write(1, x + '.\n')
             return 0
         t, cbuilder = self.compile(entry_point)
@@ -294,25 +294,29 @@
         assert 'bok' not in err
         # check with PYPYLOG=:- (means print to stderr)
         out, err = cbuilder.cmdexec("", err=True, env={'PYPYLOG': ':-'})
-        assert out.strip() == 'got:abcd.'
+        assert out.strip() == 'got:bcda.'
         assert 'toplevel' in err
-        assert 'mycat' in err
+        assert '{mycat' in err
+        assert 'mycat}' in err
         assert 'foo 2 bar 3' in err
-        assert 'cat2' in err
+        assert '{cat2' in err
+        assert 'cat2}' in err
         assert 'baz' in err
         assert 'bok' in err
         # check with PYPYLOG=:somefilename
         path = udir.join('test_debug_xxx.log')
         out, err = cbuilder.cmdexec("", err=True,
                                     env={'PYPYLOG': ':%s' % path})
-        assert out.strip() == 'got:abcd.'
+        assert out.strip() == 'got:bcda.'
         assert not err
         assert path.check(file=1)
         data = path.read()
         assert 'toplevel' in data
-        assert 'mycat' in data
+        assert '{mycat' in data
+        assert 'mycat}' in data
         assert 'foo 2 bar 3' in data
-        assert 'cat2' in data
+        assert '{cat2' in data
+        assert 'cat2}' in data
         assert 'baz' in data
         assert 'bok' in data
         # check with PYPYLOG=somefilename
@@ -323,22 +327,25 @@
         assert path.check(file=1)
         data = path.read()
         assert 'toplevel' in data
-        assert 'mycat' in data
+        assert '{mycat' in data
+        assert 'mycat}' in data
         assert 'foo 2 bar 3' not in data
-        assert 'cat2' in data
+        assert '{cat2' in data
+        assert 'cat2}' in data
         assert 'baz' not in data
         assert 'bok' not in data
         # check with PYPYLOG=myc:somefilename   (includes mycat but not cat2)
         path = udir.join('test_debug_xxx_myc.log')
         out, err = cbuilder.cmdexec("", err=True,
                                     env={'PYPYLOG': 'myc:%s' % path})
-        assert out.strip() == 'got:abd.'
+        assert out.strip() == 'got:bda.'
         assert not err
         assert path.check(file=1)
         data = path.read()
-        assert 'toplevel' in path.read()
-        assert 'mycat' in path.read()
-        assert 'foo 2 bar 3' in path.read()
+        assert 'toplevel' in data
+        assert '{mycat' in data
+        assert 'mycat}' in data
+        assert 'foo 2 bar 3' in data
         assert 'cat2' not in data
         assert 'baz' not in data
         assert 'bok' in data