Skip to content

Add test to assert on exception raised by resolve_dtype_iter #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 29, 2021
Merged

Add test to assert on exception raised by resolve_dtype_iter #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
331cd3e
Add test to assert on exception raised by resolve_dtype_iter
gdevanla Jun 27, 2021
26f76bd
Verifying dtype resolution works for single item iterator
gdevanla Jun 27, 2021
c7349ef
Set up exception when resolved dtype is not set.
gdevanla Jun 27, 2021
9ba7d60
Update src/_arraykit.c
gdevanla Jun 28, 2021
40bfa4c
Update test/test_util.py
gdevanla Jun 28, 2021
1d80519
Update src/_arraykit.c
gdevanla Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/_arraykit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ AK_ResolveDTypeIter(PyObject *dtypes)
{
PyObject *iterator = PyObject_GetIter(dtypes);
if (iterator == NULL) {
// No need to set exception here. GetIter already sets TypeError
return NULL;
}
PyArray_Descr *resolved = NULL;
Expand Down Expand Up @@ -147,6 +148,10 @@ AK_ResolveDTypeIter(PyObject *dtypes)
}
}
Py_DECREF(iterator);
if (!resolved) {
// this could happen if this function gets an empty tuple
PyErr_SetString(PyExc_ValueError, "iterable passed to resolve dtypes is empty");
}
return resolved;
}

Expand Down
9 changes: 9 additions & 0 deletions test/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import pytest
import collections
import datetime
import unittest
Expand Down Expand Up @@ -117,6 +118,14 @@ def test_resolve_dtype_iter_a(self) -> None:
self.assertEqual(resolve_dtype_iter((a3.dtype, a5.dtype)).kind, 'U')
self.assertEqual(resolve_dtype_iter((a3.dtype, a5.dtype)).itemsize, 40)

with pytest.raises(TypeError):
resolve_dtype_iter((a3.dtype, int))

self.assertEqual(resolve_dtype_iter((a1.dtype,)), a1.dtype)

with pytest.raises(ValueError):
resolve_dtype_iter(())

#---------------------------------------------------------------------------

def test_shape_filter_a(self) -> None:
Expand Down