[pypy-svn] r66078 - pypy/branch/pyjitpl5/pypy/translator/cli/test

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:40:23 2009
New Revision: 66078

Added:
   pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/cli/test/test_carbonpython.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r65277 | antocuni | 2009-05-16 11:08:29 +0200 (Sat, 16 May 2009) | 2 lines
    
    bah, skip the whole test :-/
    
    ------------------------------------------------------------------------
    r65269 | antocuni | 2009-05-15 15:07:26 +0200 (Fri, 15 May 2009) | 4 lines
    
    fix this test as well. I wonder if the failures might be caused by some race
    condition when writing tmp.cs
    
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/cli/test/test_carbonpython.py.merge.tmp	Tue Jun 30 16:40:23 2009
@@ -1,4 +1,6 @@
 import py
+py.test.skip("it passes usually, but fails on buildbot, no clue why")
+
 import os
 import os.path
 from pypy.tool import udir
@@ -145,6 +147,7 @@
         assert res == 42
 
     def test_compile_dll(self):
+        py.test.skip('This test fails every other day. No clue why :-(')
         cwd, _ = os.path.split(__file__)
         mylib_py = os.path.join(cwd, 'mylib.py')
         compile_dll(mylib_py, copy_dll=False)