Merge branch '9996-stop-on-error'

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

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 48158a74e06d0bc2efda57d2cf97dec1bc08485f..39f110962b8c79f39fff8b8de6ba38fefc850f5a 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -1142,13 +1142,10 @@ class TokenExpiryTest(MountTestBase):
 
     @mock.patch('arvados.keep.KeepClient.get')
     def runTest(self, mocked_get):
-        logging.getLogger('arvados.arvados_fuse').setLevel(logging.DEBUG)
+        self.api._rootDesc = {"blobSignatureTtl": 2}
         mnt = self.make_mount(fuse.CollectionDirectory, collection_record='zzzzz-4zz18-op4e2lbej01tcvu')
         mocked_get.return_value = 'fake data'
 
-        mnt._poll = True
-        mnt._poll_time = 1
-
         old_exp = int(time.time()) + 86400*14
         self.pool.apply(_test_refresh_old_manifest, (self.mounttmp,))
         want_exp = int(time.time()) + 86400*14
@@ -1158,7 +1155,7 @@ class TokenExpiryTest(MountTestBase):
             re.search(r'\+A[0-9a-f]+@([0-9a-f]+)', got_loc).group(1),
             16)
         self.assertGreaterEqual(
-            got_exp, want_exp-1,
+            got_exp, want_exp-2,
             msg='now+2w = {:x}, but fuse fetched locator {} (old_exp {:x})'.format(
                 want_exp, got_loc, old_exp))
         self.assertLessEqual(