summaryrefslogtreecommitdiff
path: root/numpy/lib/tests
diff options
context:
space:
mode:
authorCharles Harris <charlesr.harris@gmail.com>2018-03-21 13:47:53 -0600
committerGitHub <noreply@github.com>2018-03-21 13:47:53 -0600
commitcfde48156ff9ca0502f375900079da96a1582fec (patch)
treefd6f061b7c860205f94d71fe149b5a5e2e643e14 /numpy/lib/tests
parent3629e3986333ecdf394924e53265e0d1061e928d (diff)
parented6c0dd342c7d6def2600db00c3eaf75e16a39d2 (diff)
downloadnumpy-cfde48156ff9ca0502f375900079da96a1582fec.tar.gz
Merge pull request #10777 from charris/prep-for-pytest
MAINT: Remove use of unittest in NumPy tests.
Diffstat (limited to 'numpy/lib/tests')
-rw-r--r--numpy/lib/tests/test_io.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index a0f256726..5d7dc32dd 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -599,11 +599,11 @@ class LoadTxtBase(object):
class TestLoadTxt(LoadTxtBase):
loadfunc = staticmethod(np.loadtxt)
- def setUp(self):
+ def setup(self):
# lower chunksize for testing
self.orig_chunk = np.lib.npyio._loadtxt_chunksize
np.lib.npyio._loadtxt_chunksize = 1
- def tearDown(self):
+ def teardown(self):
np.lib.npyio._loadtxt_chunksize = self.orig_chunk
def test_record(self):