Author: Ronan Lamy <[email protected]>
Branch: fix-result-types
Changeset: r77673:d2669dd5d8c5
Date: 2015-05-29 04:25 +0100
http://bitbucket.org/pypy/pypy/changeset/d2669dd5d8c5/
Log: fix test
diff --git a/pypy/module/micronumpy/test/test_ndarray.py
b/pypy/module/micronumpy/test/test_ndarray.py
--- a/pypy/module/micronumpy/test/test_ndarray.py
+++ b/pypy/module/micronumpy/test/test_ndarray.py
@@ -1954,7 +1954,10 @@
b = concatenate((a[:3], a[-3:]))
assert (b == [2, 6, 10, 2, 6, 10]).all()
a = concatenate((array([1]), array(['abc'])))
- assert str(a.dtype) == '|S21'
+ if dtype('l').itemsize == 4: # 32-bit platform
+ assert str(a.dtype) == '|S11'
+ else:
+ assert str(a.dtype) == '|S21'
a = concatenate((array([]), array(['abc'])))
assert a[0] == 'abc'
a = concatenate((['abcdef'], ['abc']))
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
