From a18005f8b35a68b4fcd9ccdf76832b28e564289c Mon Sep 17 00:00:00 2001 From: Peter Amstutz Date: Tue, 7 Nov 2017 13:58:16 -0500 Subject: [PATCH] 12568: Update test to check which collection gets evicted Arvados-DCO-1.1-Signed-off-by: Peter Amstutz --- sdk/cwl/tests/test_fsaccess.py | 33 +++++++++++++++++++++++++++++++-- 1 file changed, 31 insertions(+), 2 deletions(-) diff --git a/sdk/cwl/tests/test_fsaccess.py b/sdk/cwl/tests/test_fsaccess.py index 43a508fe30..d52e948710 100644 --- a/sdk/cwl/tests/test_fsaccess.py +++ b/sdk/cwl/tests/test_fsaccess.py @@ -37,21 +37,33 @@ class TestFsAccess(unittest.TestCase): cr().manifest_text.return_value = 'x' * 524289 self.assertEqual(0, cache.total) c1 = cache.get("99999999999999999999999999999991+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*1, cache.total) c2 = cache.get("99999999999999999999999999999992+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*2, cache.total) c1 = cache.get("99999999999999999999999999999991+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*2, cache.total) c3 = cache.get("99999999999999999999999999999993+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*3, cache.total) + c4 = cache.get("99999999999999999999999999999994+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*3, cache.total) + c5 = cache.get("99999999999999999999999999999995+99") - self.assertEqual((524289*128)*3, cache.total) - c6 = cache.get("99999999999999999999999999999996+99") + self.assertNotIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524289*128)*3, cache.total) @@ -61,19 +73,36 @@ class TestFsAccess(unittest.TestCase): cr().manifest_text.return_value = 'x' * 524287 self.assertEqual(0, cache.total) c1 = cache.get("99999999999999999999999999999991+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*1, cache.total) c2 = cache.get("99999999999999999999999999999992+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*2, cache.total) c1 = cache.get("99999999999999999999999999999991+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*2, cache.total) c3 = cache.get("99999999999999999999999999999993+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*3, cache.total) + c4 = cache.get("99999999999999999999999999999994+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*4, cache.total) + c5 = cache.get("99999999999999999999999999999995+99") + self.assertIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*4, cache.total) + c6 = cache.get("99999999999999999999999999999996+99") + self.assertNotIn("99999999999999999999999999999991+99", cache.collections) + self.assertNotIn("99999999999999999999999999999992+99", cache.collections) self.assertEqual((524287*128)*4, cache.total) -- 2.30.2