[pypy-commit] pypy utf8-unicode2: Fix some tests on Windows

[waedt]

Author: Tyler Wade <wayedt at gmail.com>
Branch: utf8-unicode2
Changeset: r73350:249da6fb0a96
Date: 2014-08-29 00:31 -0500
http://bitbucket.org/pypy/pypy/changeset/249da6fb0a96/

Log:	Fix some tests on Windows

diff --git a/pypy/module/_rawffi/test/test__rawffi.py b/pypy/module/_rawffi/test/test__rawffi.py
--- a/pypy/module/_rawffi/test/test__rawffi.py
+++ b/pypy/module/_rawffi/test/test__rawffi.py
@@ -861,7 +861,7 @@
         a[2] = u'z'
         assert a[0] == u'x'
         b = _rawffi.Array('c').fromaddress(a.buffer, 38)
-        if sys.maxunicode > 65535:
+        if _rawffi.sizeof('u') == 4:
             # UCS4 build
             assert b[0] == 'x'
             assert b[1] == '\x00'
diff --git a/pypy/module/array/test/test_array.py b/pypy/module/array/test/test_array.py
--- a/pypy/module/array/test/test_array.py
+++ b/pypy/module/array/test/test_array.py
@@ -1031,9 +1031,13 @@
         assert str(buffer(self.array('i'))) == ''
 
     def test_unicode_outofrange(self):
+        a = self.array('u', unicode(r'\x01\u263a\x00\ufeff', 'unicode-escape'))
         b = self.array('u', unicode(r'\x01\u263a\x00\ufeff', 'unicode-escape'))
         b.byteswap()
-        raises(ValueError, "b[0]")
+        if b.itemsize == 4:
+            raises(ValueError, "b[0]")
+        else:
+            assert a != b
 
 
 class AppTestArrayBuiltinShortcut(AppTestArray):