fork/cellxgene-gateway
1
0
Fork 0
mirror of https://github.com/Novartis/cellxgene-gateway.git synced 2026-10-08 17:08:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

#48 fix bug in cache pruning

Browse Source
This commit is contained in:
Alok Saldanha
2021-07-12 19:19:29 -04:00
parent 520069a825
commit 264a324946
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cellxgene_gateway/prune_process_cache.py
+2 -2
View File
@@ -39,9 +39,9 @@ class PruneProcessCache:
for process in processes_to_delete: for process in processes_to_delete:
try: try:
logger.info(f"pruning process {process.pid} ({process.key.dataset})") logger.info(f"pruning process {process.pid} ({process.key.descriptor})")
self.cache.prune(process) self.cache.prune(process)
except Exception: except Exception:
logger.exception( logger.exception(
"failed to prune process {process.pid} ({process.dataset})" "failed to prune process {process.pid} ({process.key.descriptor})"
) )
tests/test_prune_process_cache.py
+2 -1
View File
@@ -14,7 +14,6 @@ key = CacheKey(
class TestPruneProcessCache(unittest.TestCase): class TestPruneProcessCache(unittest.TestCase):
@unittest.skip("skipping until #39 fixed")
@patch("cellxgene_gateway.util.current_time_stamp", new=lambda: 0) @patch("cellxgene_gateway.util.current_time_stamp", new=lambda: 0)
@patch("cellxgene_gateway.env.ttl", new="10") @patch("cellxgene_gateway.env.ttl", new="10")
@patch("cellxgene_gateway.cache_entry.CacheEntry") @patch("cellxgene_gateway.cache_entry.CacheEntry")
@@ -27,6 +26,7 @@ class TestPruneProcessCache(unittest.TestCase):
old.foo = 12 old.foo = 12
old.pid = 1 old.pid = 1
old.key = key old.key = key
old.terminate.return_value = None
seal(old) seal(old)
new.key = key new.key = key
cache.entry_list.append(old) cache.entry_list.append(old)
@@ -39,6 +39,7 @@ class TestPruneProcessCache(unittest.TestCase):
self.assertEqual(len(cache.entry_list), 1) self.assertEqual(len(cache.entry_list), 1)
self.assertEqual(cache.entry_list[0], new) self.assertEqual(cache.entry_list[0], new)
self.assertEqual(cache.entry_list[0], new) self.assertEqual(cache.entry_list[0], new)
self.assertTrue(old.terminate.called)
if __name__ == "__main__": if __name__ == "__main__":