diff options
| author | Matti Picus <matti.picus@gmail.com> | 2019-05-19 09:34:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 09:34:58 +0300 |
| commit | ecb402499dba2d105b2714a55259352c31a62bd5 (patch) | |
| tree | bcf388f945fc2eb9d4c151f776e030a65fb7fed7 /numpy/lib/tests/test_format.py | |
| parent | db595a0c4064956d2f2f904ed4a76443322bb7e9 (diff) | |
| parent | 7495de475c8c578a0c39b09bc55a88a93aa1985a (diff) | |
| download | numpy-ecb402499dba2d105b2714a55259352c31a62bd5.tar.gz | |
Merge branch 'master' into npy-2.1
Diffstat (limited to 'numpy/lib/tests/test_format.py')
| -rw-r--r-- | numpy/lib/tests/test_format.py | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/numpy/lib/tests/test_format.py b/numpy/lib/tests/test_format.py index 2cf799723..062c21725 100644 --- a/numpy/lib/tests/test_format.py +++ b/numpy/lib/tests/test_format.py @@ -412,6 +412,7 @@ record_arrays = [ np.array(NbufferT, dtype=np.dtype(Ndescr).newbyteorder('<')), np.array(PbufferT, dtype=np.dtype(Pdescr).newbyteorder('>')), np.array(NbufferT, dtype=np.dtype(Ndescr).newbyteorder('>')), + np.zeros(1, dtype=[('c', ('<f8', (5,)), (2,))]) ] @@ -629,6 +630,61 @@ def test_pickle_disallow(): assert_raises(ValueError, np.save, path, np.array([None], dtype=object), allow_pickle=False) +@pytest.mark.parametrize('dt', [ + np.dtype(np.dtype([('a', np.int8), + ('b', np.int16), + ('c', np.int32), + ], align=True), + (3,)), + np.dtype([('x', np.dtype({'names':['a','b'], + 'formats':['i1','i1'], + 'offsets':[0,4], + 'itemsize':8, + }, + (3,)), + (4,), + )]), + np.dtype([('x', + ('<f8', (5,)), + (2,), + )]), + np.dtype([('x', np.dtype(( + np.dtype(( + np.dtype({'names':['a','b'], + 'formats':['i1','i1'], + 'offsets':[0,4], + 'itemsize':8}), + (3,) + )), + (4,) + ))) + ]), + np.dtype([ + ('a', np.dtype(( + np.dtype(( + np.dtype(( + np.dtype([ + ('a', int), + ('b', np.dtype({'names':['a','b'], + 'formats':['i1','i1'], + 'offsets':[0,4], + 'itemsize':8})), + ]), + (3,), + )), + (4,), + )), + (5,), + ))) + ]), + ]) + +def test_descr_to_dtype(dt): + dt1 = format.descr_to_dtype(dt.descr) + assert_equal_(dt1, dt) + arr1 = np.zeros(3, dt) + arr2 = roundtrip(arr1) + assert_array_equal(arr1, arr2) def test_version_2_0(): f = BytesIO() |