TEST: Change unit test arrayproxy mocks - no longer necessary.

Author: pauldmccarthy

nibabel/benchmarks/bench_arrayproxy_slicing.py

@@ -62,8 +62,7 @@
 @contextlib.contextmanager
 def patch_indexed_gzip(have_igzip):
 
-    atts = ['nibabel.openers.HAVE_INDEXED_GZIP',
-            'nibabel.arrayproxy.HAVE_INDEXED_GZIP']
+    atts = ['nibabel.openers.HAVE_INDEXED_GZIP']
 
     with mock.patch(atts[0], have_igzip), mock.patch(atts[1], have_igzip):
         yield

nibabel/tests/test_arrayproxy.py

@@ -369,7 +369,7 @@ def test_keep_file_open_true_false_invalid():
         # Test that ArrayProxy(keep_file_open=True) only creates one file
         # handle, and that ArrayProxy(keep_file_open=False) creates a file
         # handle on every data access.
-        with mock.patch('nibabel.arrayproxy.ImageOpener', CountingImageOpener):
+        with mock.patch('nibabel.openers.ImageOpener', CountingImageOpener):
             proxy_no_kfp = ArrayProxy(fname, ((10, 10, 10), dtype),
                                       keep_file_open=False)
             assert not proxy_no_kfp._keep_file_open
@@ -418,15 +418,15 @@ def test_keep_file_open_auto():
         # If have_indexed_gzip, then the arrayproxy should create one
         # ImageOpener
         with patch_indexed_gzip(True), \
-             mock.patch('nibabel.arrayproxy.ImageOpener', CountingImageOpener):
+             mock.patch('nibabel.openers.ImageOpener', CountingImageOpener):
             CountingImageOpener.num_openers = 0
             proxy = ArrayProxy(fname, ((10, 10, 10), dtype),
                                keep_file_open='auto')
             assert proxy._keep_file_open == 'auto'
             assert _count_ImageOpeners(proxy, data, voxels) == 1
         # If no have_indexed_gzip, then keep_file_open should be False
         with patch_indexed_gzip(False), \
-             mock.patch('nibabel.arrayproxy.ImageOpener', CountingImageOpener):
+             mock.patch('nibabel.openers.ImageOpener', CountingImageOpener):
             CountingImageOpener.num_openers = 0
             proxy = ArrayProxy(fname, ((10, 10, 10), dtype),
                                keep_file_open='auto')
@@ -438,14 +438,14 @@ def test_keep_file_open_auto():
             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):
+             mock.patch('nibabel.openers.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):
+             mock.patch('nibabel.openers.ImageOpener', CountingImageOpener):
             CountingImageOpener.num_openers = 0
             proxy = ArrayProxy(fname, ((10, 10, 10), dtype),
                                keep_file_open='auto')

nibabel/tests/test_openers.py

@@ -108,12 +108,11 @@ def patch_indexed_gzip(state):
     # Make it look like we do (state==True) or do not (state==False) have
     # the indexed gzip module.
     if state:
-        values = (True, True, MockIndexedGzipFile)
+        values = (True, MockIndexedGzipFile)
     else:
-        values = (False, False, GzipFile)
+        values = (False, GzipFile)
     with mock.patch('nibabel.openers.HAVE_INDEXED_GZIP', values[0]), \
-         mock.patch('nibabel.arrayproxy.HAVE_INDEXED_GZIP', values[1]), \
-         mock.patch('nibabel.openers.IndexedGzipFile', values[2],
+         mock.patch('nibabel.openers.IndexedGzipFile', values[1],
                     create=True):
         yield