[pypy-commit] pypy default: merged upstream

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: 
Changeset: r66441:aeecc7f99342
Date: 2013-08-29 18:14 -0700
http://bitbucket.org/pypy/pypy/changeset/aeecc7f99342/

Log:	merged upstream

diff --git a/pypy/module/micronumpy/test/test_numarray.py b/pypy/module/micronumpy/test/test_numarray.py
--- a/pypy/module/micronumpy/test/test_numarray.py
+++ b/pypy/module/micronumpy/test/test_numarray.py
@@ -1939,6 +1939,7 @@
 
         assert (a == [[1., 1., 1.]]).all()
 
+    @py.test.mark.xfail
     def test_boolean_array(self):
         import numpypy as np
         a = np.ndarray([1], dtype=bool)