6833: Test setting small blobSignatureTtl. Fix earlier fix.

diff --git a/services/fuse/arvados_fuse/fusedir.py b/services/fuse/arvados_fuse/fusedir.py
index 00efab765a6d59b52f33b62b80847247fb368c1e..abad22df11e359610f7a8072f449f695b6c29bc6 100644 (file)
--- a/services/fuse/arvados_fuse/fusedir.py
+++ b/services/fuse/arvados_fuse/fusedir.py
@@ -327,12 +327,12 @@ class CollectionDirectory(CollectionDirectoryBase):
         self.num_retries = num_retries
         self.collection_record_file = None
         self.collection_record = None
-        self.poll = True
+        self._poll = True
         try:
-            self.poll_time = (api._rootDesc.get('blobSignatureTtl', 60*60*2)/2)
+            self._poll_time = (api._rootDesc.get('blobSignatureTtl', 60*60*2)/2)
         except:
             _logger.debug("Error getting blobSignatureTtl from discovery document: %s", sys.exc_info()[0])
-            self.poll_time = 60*60
+            self._poll_time = 60*60
 
         if isinstance(collection_record, dict):
             self.collection_locator = collection_record['uuid']

diff --git a/services/fuse/tests/test_mount.py b/services/fuse/tests/test_mount.py
index 48158a74e06d0bc2efda57d2cf97dec1bc08485f..fa48849626a5d251c57ba1584b78855d1c73d0a6 100644 (file)
--- a/services/fuse/tests/test_mount.py
+++ b/services/fuse/tests/test_mount.py
@@ -1143,12 +1143,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