Merge pull request #197 from valeriupredoi/zero-chunk

Set count to 0 for 0-sized data
NCAS-CMS · Apr 25, 2024 · e4f2067 · e4f2067
2 parents 4816902 + 8b46b4b
commit e4f2067
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/activestorage/storage.py b/activestorage/storage.py
@@ -49,7 +49,7 @@ def reduce_chunk(rfile,
         if tmp.size:
             return method(tmp), tmp.size
         else:
-            return tmp, None
+            return tmp, 0
     else:
         return tmp, None
 

diff --git a/tests/unit/test_storage.py b/tests/unit/test_storage.py
@@ -60,7 +60,7 @@ def test_reduced_chunk_fully_masked_data_fill():
                          order="C", chunk_selection=ch_sel,
                          method=np.mean)
     assert rc[0].size == 0
-    assert rc[1] is None
+    assert rc[1] == 0
 
 
 def test_reduced_chunk_fully_masked_data_missing():
@@ -79,7 +79,7 @@ def test_reduced_chunk_fully_masked_data_missing():
                          order="C", chunk_selection=ch_sel,
                          method=np.mean)
     assert rc[0].size == 0
-    assert rc[1] is None
+    assert rc[1] == 0
 
 
 def test_reduced_chunk_fully_masked_data_vmin():
@@ -98,7 +98,7 @@ def test_reduced_chunk_fully_masked_data_vmin():
                          order="C", chunk_selection=ch_sel,
                          method=np.mean)
     assert rc[0].size == 0
-    assert rc[1] is None
+    assert rc[1] == 0
 
 
 def test_reduced_chunk_fully_masked_data_vmax():
@@ -117,7 +117,7 @@ def test_reduced_chunk_fully_masked_data_vmax():
                          order="C", chunk_selection=ch_sel,
                          method=np.mean)
     assert rc[0].size == 0
-    assert rc[1] is None
+    assert rc[1] == 0
 
 
 def test_zero_data():