summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Berg <sebastian@sipsolutions.net>2012-09-29 18:26:13 +0200
committerSebastian Berg <sebastian@sipsolutions.net>2012-09-29 18:26:13 +0200
commitc5e8990bd857fd0869e7437428e5bf0d491336a0 (patch)
treeb6f356081181942d61f6d34b327d5ec4e75864f8
parent095534fbceb34b03a5c963acd77834a9b001bf38 (diff)
downloadnumpy-c5e8990bd857fd0869e7437428e5bf0d491336a0.tar.gz
TST: Test that ndmin honors requested and original order.
-rw-r--r--numpy/core/tests/test_regression.py7
1 files changed, 7 insertions, 0 deletions
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
index 696bae622..45bc12cda 100644
--- a/numpy/core/tests/test_regression.py
+++ b/numpy/core/tests/test_regression.py
@@ -458,6 +458,13 @@ class TestRegression(TestCase):
assert_equal(np.array(x,dtype=np.float32,ndmin=2).ndim,2)
assert_equal(np.array(x,dtype=np.float64,ndmin=2).ndim,2)
+ def test_ndmin_order(self, level=rlevel):
+ """Issue #465 and related checks"""
+ assert_(np.array([1,2], order='C', ndmin=3).flags.c_contiguous)
+ assert_(np.array([1,2], order='F', ndmin=3).flags.f_contiguous)
+ assert_(np.array(np.ones((2,2), order='F'), ndmin=3).flags.f_contiguous)
+ assert_(np.array(np.ones((2,2), order='C'), ndmin=3).flags.c_contiguous)
+
def test_mem_axis_minimization(self, level=rlevel):
"""Ticket #327"""
data = np.arange(5)