Merge pull request #1386 from girder/adjust-tests

Adjust tests to not clear tile source cache unless needed

large_image/config.py

@@ -36,7 +36,7 @@
     # For tilesources.  These are also limited by available file handles.
     # 'python' cache can use 1/(val) of the available memory based on a very
     # rough estimate of the amount of memory used by a tilesource
-    'cache_tilesource_memory_portion': 8,
+    'cache_tilesource_memory_portion': 16,
     # If >0, this is the maximum number of tilesources that will be cached
     'cache_tilesource_maximum': 0,
 

test/test_source_base.py

@@ -10,7 +10,6 @@
 import pytest
 
 import large_image
-from large_image.cache_util import cachesClear
 from large_image.tilesource import nearPowerOfTwo
 
 from . import utilities
@@ -170,8 +169,6 @@ def testSourcesCanRead(filename, source):
     mod = sys.modules[sourceClass.__module__]
     assert bool(mod.canRead(imagePath)) is bool(canRead)
 
-    cachesClear()
-
 
 @pytest.mark.parametrize(('filename', 'source'), sourceAndRegistry())
 def testSourcesCanReadPath(filename, source):
@@ -184,8 +181,6 @@ def testSourcesCanReadPath(filename, source):
     sourceClass = large_image.tilesource.AvailableTileSources[source]
     assert bool(sourceClass.canRead(Path(imagePath))) is bool(canRead)
 
-    cachesClear()
-
 
 @pytest.mark.parametrize(('filename', 'source'), sourceAndRegistry(True))
 def testSourcesTilesAndMethods(filename, source):
@@ -223,8 +218,6 @@ def testSourcesTilesAndMethods(filename, source):
     mod = sys.modules[sourceClass.__module__]
     assert mod.open(imagePath) is not None
 
-    cachesClear()
-
 
 @pytest.mark.parametrize(('filename', 'isgeo'), [
     ('04091217_ruc.nc', True),
@@ -237,8 +230,6 @@ def testIsGeospatial(filename, isgeo):
     imagePath = datastore.fetch(filename)
     assert large_image.tilesource.isGeospatial(imagePath) == isgeo
 
-    cachesClear()
-
 
 @pytest.mark.parametrize('palette', [
     ['#000', '#FFF'],

test/test_source_bioformats.py

@@ -1,5 +1,3 @@
-from large_image.cache_util import cachesClear
-
 from . import utilities
 from .datastore import datastore
 
@@ -19,9 +17,6 @@ def testTilesFromBioformats():
     # assert tileMetadata['magnification'] == pytest.approx(20, 1)
     utilities.checkTilesZXY(source, tileMetadata)
 
-    source = None
-    cachesClear()
-
 
 def testInternalMetadata():
     import large_image_source_bioformats
@@ -30,6 +25,3 @@ def testInternalMetadata():
     source = large_image_source_bioformats.open(imagePath)
     metadata = source.getInternalMetadata()
     assert 'sizeColorPlanes' in metadata
-
-    source = None
-    cachesClear()

test/test_source_dicomweb.py

@@ -1,7 +1,5 @@
 import pytest
 
-from large_image.cache_util import cachesClear
-
 from . import utilities
 
 
@@ -27,6 +25,3 @@ def testTilesFromDICOMweb():
     assert tileMetadata['levels'] == 9
 
     utilities.checkTilesZXY(source, tileMetadata)
-
-    source = None
-    cachesClear()

test/test_source_hdf5.py

@@ -6,16 +6,15 @@
 import pytest
 
 import large_image
-from large_image.cache_util import cachesClear
 
 possible_axes = {
     'x': [1, 10],
     'y': [1, 10],
-    'c': [1, 100],
-    'z': [1, 100],
-    't': [1, 100],
-    'p': [1, 100],
-    'q': [1, 100],
+    'c': [1, 40],
+    'z': [1, 40],
+    't': [1, 40],
+    'p': [1, 20],
+    'q': [1, 20],
     's': [3, 3],
 }
 
@@ -191,9 +190,6 @@ def testImageGeneration(data_range):
     # assert numpy.array_equal(result, resultFromFile)
     print(f'Success; result matrix {result.shape} equals expected matrix {expected.shape}.')
 
-    source = None
-    cachesClear()
-
 
 if __name__ == '__main__':
     testImageGeneration(None)

test/test_source_openjpeg.py

@@ -1,4 +1,5 @@
 import large_image_source_openjpeg
+import pytest
 
 from . import utilities
 from .datastore import datastore
@@ -30,6 +31,7 @@ def testAssociatedImagesFromOpenJPEG():
     assert source.getAssociatedImage('nosuchimage') is None
 
 
+@pytest.mark.singular()
 def testBelowLevelTilesFromOpenJPEG():
     from large_image.cache_util import cachesClear
 

tox.ini

@@ -38,7 +38,7 @@ allowlist_externals =
 commands =
   rm -rf build/test/coverage/web_temp
   girder build --dev
-  pytest --numprocesses 1 -m 'singular' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 0 -m 'singular' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular and not notebook' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
   - npx nyc report --temp-dir build/test/coverage/web_temp --report-dir build/test/coverage --reporter cobertura --reporter text-summary
 # Reduce npm chatter
@@ -75,7 +75,7 @@ setenv = {[testenv:test]setenv}
 description = Run all tests except Girder client
 deps = {[testenv:test]deps}
 commands =
-  pytest --numprocesses 1 -m 'singular and not girder_client' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 0 -m 'singular and not girder_client' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular and not girder_client' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
 
 [testenv:server-py{38,39,310,311,312}]
@@ -97,7 +97,7 @@ deps =
   pytest-rerunfailures
   pytest-xdist
 commands =
-  pytest --numprocesses 1 -m 'singular and not girder' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
+  pytest --numprocesses 0 -m 'singular and not girder' --cov-config tox.ini --suppress-no-test-exit-code {posargs}
   pytest --numprocesses logical -m 'not singular and not girder and not notebook' --cov-config tox.ini --cov-append --suppress-no-test-exit-code {posargs}
 
 [testenv:core-py{38,39,310,311,312}]
@@ -117,7 +117,7 @@ deps =
   pytest-rerunfailures
   pytest-xdist
 commands =
-  pytest --numprocesses 1 -m 'notebook' --no-cov --suppress-no-test-exit-code test/test_notebooks.py {posargs}
+  pytest --numprocesses 0 -m 'notebook' --no-cov --suppress-no-test-exit-code test/test_notebooks.py {posargs}
 setenv =
   PIP_FIND_LINKS=https://girder.github.io/large_image_wheels
   GDAL_PAM_ENABLED=no