diff options
author | Alan McIntyre <alan.mcintyre@local> | 2008-06-17 00:23:20 +0000 |
---|---|---|
committer | Alan McIntyre <alan.mcintyre@local> | 2008-06-17 00:23:20 +0000 |
commit | c331857d8663ecf54bbe88c834755da749e8ab52 (patch) | |
tree | f4cc69ec328a5ff4d3b108f3610acb119a196493 /numpy/ma/testutils.py | |
parent | 22ba7886a84dc6a16ca75871f7cd2f10ef8de1f9 (diff) | |
download | numpy-c331857d8663ecf54bbe88c834755da749e8ab52.tar.gz |
Switched to use nose to run tests. Added test and bench functions to all modules.
Diffstat (limited to 'numpy/ma/testutils.py')
-rw-r--r-- | numpy/ma/testutils.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/numpy/ma/testutils.py b/numpy/ma/testutils.py index 83aec7ea2..f1749619d 100644 --- a/numpy/ma/testutils.py +++ b/numpy/ma/testutils.py @@ -15,9 +15,9 @@ import operator import numpy as np from numpy import ndarray, float_ import numpy.core.umath as umath -from numpy.testing import NumpyTest, NumpyTestCase -import numpy.testing.utils as utils +from numpy.testing import * from numpy.testing.utils import build_err_msg, rand +import numpy.testing.utils as utils import core from core import mask_or, getmask, getmaskarray, masked_array, nomask, masked @@ -166,9 +166,9 @@ def assert_array_compare(comparison, x, y, err_msg='', verbose=True, header='', raise ValueError(msg) # OK, now run the basic tests on filled versions return utils.assert_array_compare(comparison, - x.filled(fill_value), y.filled(fill_value), - err_msg=err_msg, - verbose=verbose, header=header) + x.filled(fill_value), y.filled(fill_value), + err_msg=err_msg, + verbose=verbose, header=header) def assert_array_equal(x, y, err_msg='', verbose=True): |