TEST: Make sure non-gzip file handles are dropped when keep_file_open ==

'auto'. Updates to benchmark functions.

Author: pauldmccarthy

nibabel/benchmarks/bench_array_to_file.py

@@ -16,6 +16,7 @@
 from __future__ import division, print_function
 
 import sys
+from io import BytesIO  # NOQA
 
 import numpy as np
 

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -51,7 +51,7 @@
     ('?', '?', '?', ':'),
 ]
 
-KEEP_OPENS = [False, True]
+KEEP_OPENS = [False, True, 'auto']
 
 if HAVE_INDEXED_GZIP:
     HAVE_IGZIP = [False, True]

nibabel/tests/test_arrayproxy.py

@@ -432,6 +432,25 @@ def test_keep_file_open_auto():
                                keep_file_open='auto')
             assert proxy._keep_file_open is False
             assert _count_ImageOpeners(proxy, data, voxels) == 10
+        # If not a gzip file,  keep_file_open should be False
+        fname  = 'testdata'
+        with open(fname, 'wb') as fobj:
+            fobj.write(data.tostring(order='F'))
+        # regardless of whether indexed_gzip is present or not
+        with patch_indexed_gzip(True), \
+             mock.patch('nibabel.arrayproxy.ImageOpener', CountingImageOpener):
+            CountingImageOpener.num_openers = 0
+            proxy = ArrayProxy(fname, ((10, 10, 10), dtype),
+                               keep_file_open='auto')
+            assert proxy._keep_file_open is False
+            assert _count_ImageOpeners(proxy, data, voxels) == 10
+        with patch_indexed_gzip(False), \
+             mock.patch('nibabel.arrayproxy.ImageOpener', CountingImageOpener):
+            CountingImageOpener.num_openers = 0
+            proxy = ArrayProxy(fname, ((10, 10, 10), dtype),
+                               keep_file_open='auto')
+            assert proxy._keep_file_open is False
+            assert _count_ImageOpeners(proxy, data, voxels) == 10
 
 
 @contextlib.contextmanager

nibabel/tests/test_openers.py

@@ -133,14 +133,18 @@ def test_Opener_gzip_type():
         # Each test is specified by a tuple containing:
         #   (indexed_gzip present, Opener kwargs, expected file type)
         tests = [
-            (False, {'mode' : 'rb', 'keep_open' : True},  GzipFile),
-            (False, {'mode' : 'rb', 'keep_open' : False}, GzipFile),
-            (False, {'mode' : 'wb', 'keep_open' : True},  GzipFile),
-            (False, {'mode' : 'wb', 'keep_open' : False}, GzipFile),
-            (True,  {'mode' : 'rb', 'keep_open' : True},  MockIndexedGzipFile),
-            (True,  {'mode' : 'rb', 'keep_open' : False}, GzipFile),
-            (True,  {'mode' : 'wb', 'keep_open' : True},  GzipFile),
-            (True,  {'mode' : 'wb', 'keep_open' : False}, GzipFile),
+            (False, {'mode' : 'rb', 'keep_open' : True},   GzipFile),
+            (False, {'mode' : 'rb', 'keep_open' : False},  GzipFile),
+            (False, {'mode' : 'rb', 'keep_open' : 'auto'}, GzipFile),
+            (False, {'mode' : 'wb', 'keep_open' : True},   GzipFile),
+            (False, {'mode' : 'wb', 'keep_open' : False},  GzipFile),
+            (False, {'mode' : 'rb', 'keep_open' : 'auto'}, GzipFile),
+            (True,  {'mode' : 'rb', 'keep_open' : True},   MockIndexedGzipFile),
+            (True,  {'mode' : 'rb', 'keep_open' : False},  GzipFile),
+            (True,  {'mode' : 'rb', 'keep_open' : 'auto'}, MockIndexedGzipFile),
+            (True,  {'mode' : 'wb', 'keep_open' : True},   GzipFile),
+            (True,  {'mode' : 'wb', 'keep_open' : False},  GzipFile),
+            (True,  {'mode' : 'rb', 'keep_open' : 'auto'}, GzipFile),
         ]
 
         for test in tests: