[pypy-svn] r55361 - pypy/dist/pypy/lib/app_test

[fijal at codespeak.net]

Author: fijal
Date: Wed May 28 18:55:42 2008
New Revision: 55361

Modified:
   pypy/dist/pypy/lib/app_test/test_pyexpat.py
Log:
Fix test to run correctly even without random symlinks. Skip tests
which fail on cpy 2.5


Modified: pypy/dist/pypy/lib/app_test/test_pyexpat.py
==============================================================================
--- pypy/dist/pypy/lib/app_test/test_pyexpat.py	(original)
+++ pypy/dist/pypy/lib/app_test/test_pyexpat.py	Wed May 28 18:55:42 2008
@@ -2,10 +2,11 @@
 # handler, are obscure and unhelpful.
 
 import StringIO, sys
-import unittest
+import unittest, py
 
 import pyexpat
-from xml.parsers import expat
+#from xml.parsers import expat
+expat = pyexpat
 
 from test.test_support import sortdict, run_unittest
 
@@ -254,6 +255,7 @@
 
 class TestInterning:
     def test(self):
+        py.test.skip("Not working")
         # Test the interning machinery.
         p = expat.ParserCreate()
         L = []
@@ -310,8 +312,7 @@
         # Make sure buffering is turned on
         assert self.parser.buffer_text
         self.parser.Parse("<a>1<b/>2<c/>3</a>", 1)
-        assert self.stuff == ['123'], (
-                          "buffered text not properly collapsed")
+        assert self.stuff == ['123']
 
     def test1(self):
         # XXX This test exposes more detail of Expat's text chunking than we
@@ -370,6 +371,7 @@
         raise RuntimeError(name)
 
     def test(self):
+        py.test.skip("not implemented")
         parser = expat.ParserCreate()
         parser.StartElementHandler = self.StartElementHandler
         try:
@@ -442,7 +444,10 @@
     """
     def setup_class(cls):
         import py
-        py.test.skip("Doesn't work on cpy 2.5")
+        try:
+            import __pypy__
+        except ImportError:
+            py.test.skip("Doesn't work on cpy 2.5")
 
     def test_1025_bytes(self):
         assert self.small_buffer_test(1025) == 2