Merge branch '12430-output-glob'

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

diff --git a/services/fuse/tests/test_token_expiry.py b/services/fuse/tests/test_token_expiry.py
index e082e525c5d8b910b8d58a0c32b5631c2027549c..046a835893d5117a7497d75f3ac9b12a2ae340f2 100644 (file)
--- a/services/fuse/tests/test_token_expiry.py
+++ b/services/fuse/tests/test_token_expiry.py
@@ -1,8 +1,11 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 import apiclient
 import arvados
 import arvados_fuse
 import logging
-import mock
 import multiprocessing
 import os
 import re
@@ -10,6 +13,8 @@ import sys
 import time
 import unittest
 
+from unittest import mock
+
 from .integration_test import IntegrationTest
 
 logger = logging.getLogger('arvados.arv-mount')
@@ -28,10 +33,10 @@ class TokenExpiryTest(IntegrationTest):
     def fake_open(self, operations, *args, **kwargs):
         self.time_now += 86400*13
         logger.debug('opening file at time=%f', self.time_now)
-        return self.orig_open(operations, *args, **kwargs)
+        return TokenExpiryTest.orig_open(operations, *args, **kwargs)
 
     @mock.patch.object(arvados_fuse.Operations, 'open', autospec=True)
-    @mock.patch('time.time')
+    @mock.patch.object(time, 'time', return_value=0)
     @mock.patch('arvados.keep.KeepClient.get')
     @IntegrationTest.mount(argv=['--mount-by-id', 'zzz'])
     def test_refresh_old_manifest(self, mocked_get, mocked_time, mocked_open):
@@ -40,7 +45,7 @@ class TokenExpiryTest(IntegrationTest):
         # blobSignatureTtl seconds elapse between open() and
         # read(). See https://dev.arvados.org/issues/10008
 
-        mocked_get.return_value = 'fake data'
+        mocked_get.return_value = b'fake data'
         mocked_time.side_effect = self.fake_time
         mocked_open.side_effect = self.fake_open