21356: Remove all Python 2/3 compatibility imports

[arvados.git] / services / fuse / tests / test_inodes.py

diff --git a/services/fuse/tests/test_inodes.py b/services/fuse/tests/test_inodes.py
index aaef8e4b57a31cce9c3afeee6a055e4823da8274..cc22f521e0b5653d8912b280c29c66c8760a89a7 100644 (file)
--- a/services/fuse/tests/test_inodes.py
+++ b/services/fuse/tests/test_inodes.py
@@ -3,11 +3,12 @@
 # SPDX-License-Identifier: AGPL-3.0
 
 import arvados_fuse
-import mock
 import unittest
 import llfuse
 import logging
 
+from unittest import mock
+
 class InodeTests(unittest.TestCase):
 
     # The following tests call next(inodes._counter) because inode 1
@@ -81,13 +82,16 @@ class InodeTests(unittest.TestCase):
 
         # Change min_entries
         cache.min_entries = 1
+        ent1.parent_inode = None
         inodes.cap_cache()
         inodes.wait_remove_queue_empty()
         self.assertEqual(600, cache.total())
         self.assertTrue(ent1.clear.called)
 
         # Touching ent1 should cause ent3 to get cleared
+        ent3.parent_inode = None
         self.assertFalse(ent3.clear.called)
+        inodes.inode_cache.update_cache_size(ent1)
         inodes.touch(ent1)
         inodes.wait_remove_queue_empty()
         self.assertTrue(ent3.clear.called)
@@ -132,6 +136,7 @@ class InodeTests(unittest.TestCase):
         ent3.has_ref.return_value = False
         ent1.clear.called = False
         ent3.clear.called = False
+        ent3.parent_inode = None
         inodes.touch(ent3)
         inodes.wait_remove_queue_empty()
         self.assertFalse(ent1.clear.called)
@@ -164,6 +169,6 @@ class InodeTests(unittest.TestCase):
         inodes.wait_remove_queue_empty()
         self.assertEqual(0, cache.total())
 
-        inodes.touch(ent3)
+        inodes.add_entry(ent3)
         inodes.wait_remove_queue_empty()
         self.assertEqual(600, cache.total())