summaryrefslogtreecommitdiff
path: root/numpy/lib
diff options
context:
space:
mode:
authorPauli Virtanen <pav@iki.fi>2019-12-04 20:49:56 +0200
committerPauli Virtanen <pav@iki.fi>2019-12-04 20:55:07 +0200
commitd3f6a7eddc68c9160db695106d196cebbc8d9fd4 (patch)
tree5753414a695100400478db78be609b3993a11ab4 /numpy/lib
parent8f6bdf83f40c22a76f75c42b7dacf34f0229082f (diff)
downloadnumpy-d3f6a7eddc68c9160db695106d196cebbc8d9fd4.tar.gz
TST: fix up issues in requires_memory decorator
Fix wrong multiplier for /proc/meminfo, and do style cleanups.
Diffstat (limited to 'numpy/lib')
-rw-r--r--numpy/lib/tests/test_io.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index 4188265e8..39fe40685 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -576,7 +576,7 @@ class TestSaveTxt(object):
@pytest.mark.skipif(sys.platform=='win32',
reason="large files cause problems")
@pytest.mark.slow
- @requires_memory(7e9)
+ @requires_memory(free_bytes=7e9)
def test_large_zip(self):
# The test takes at least 6GB of memory, writes a file larger than 4GB
test_data = np.asarray([np.random.rand(np.random.randint(50,100),4)