From 264a324946996cf754fce3f236bb15943396b4ee Mon Sep 17 00:00:00 2001 From: Alok Saldanha Date: Mon, 12 Jul 2021 19:19:29 -0400 Subject: [PATCH] #48 fix bug in cache pruning --- cellxgene_gateway/prune_process_cache.py | 4 ++-- tests/test_prune_process_cache.py | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cellxgene_gateway/prune_process_cache.py b/cellxgene_gateway/prune_process_cache.py index d4b2f2e..29eafb4 100644 --- a/cellxgene_gateway/prune_process_cache.py +++ b/cellxgene_gateway/prune_process_cache.py @@ -39,9 +39,9 @@ class PruneProcessCache: for process in processes_to_delete: 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) except Exception: logger.exception( - "failed to prune process {process.pid} ({process.dataset})" + "failed to prune process {process.pid} ({process.key.descriptor})" ) diff --git a/tests/test_prune_process_cache.py b/tests/test_prune_process_cache.py index 4320c4c..b500007 100644 --- a/tests/test_prune_process_cache.py +++ b/tests/test_prune_process_cache.py @@ -14,7 +14,6 @@ key = CacheKey( class TestPruneProcessCache(unittest.TestCase): - @unittest.skip("skipping until #39 fixed") @patch("cellxgene_gateway.util.current_time_stamp", new=lambda: 0) @patch("cellxgene_gateway.env.ttl", new="10") @patch("cellxgene_gateway.cache_entry.CacheEntry") @@ -27,6 +26,7 @@ class TestPruneProcessCache(unittest.TestCase): old.foo = 12 old.pid = 1 old.key = key + old.terminate.return_value = None seal(old) new.key = key cache.entry_list.append(old) @@ -39,6 +39,7 @@ class TestPruneProcessCache(unittest.TestCase): self.assertEqual(len(cache.entry_list), 1) self.assertEqual(cache.entry_list[0], new) self.assertEqual(cache.entry_list[0], new) + self.assertTrue(old.terminate.called) if __name__ == "__main__":