projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '18663-add-keepbalance-support'
[arvados.git]
/
services
/
fuse
/
tests
/
test_retry.py
diff --git
a/services/fuse/tests/test_retry.py
b/services/fuse/tests/test_retry.py
index b46ba7839f72f2a578fb6fbcdcbe8fbe9e71d681..b69707af4fde2e0069529ed2d5b575d89d7c4728 100644
(file)
--- a/
services/fuse/tests/test_retry.py
+++ b/
services/fuse/tests/test_retry.py
@@
-1,11
+1,18
@@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
+from __future__ import absolute_import
+from future import standard_library
+standard_library.install_aliases()
import arvados
import arvados_fuse.command
import json
import mock
import os
import pycurl
import arvados
import arvados_fuse.command
import json
import mock
import os
import pycurl
-import
Q
ueue
-import run_test_server
+import
q
ueue
+
from .
import run_test_server
import tempfile
import unittest
import tempfile
import unittest
@@
-46,11
+53,11
@@
class RetryPUT(IntegrationTest):
def test_retry_write(self, sleep):
mockedCurl = mock.Mock(spec=pycurl.Curl(), wraps=pycurl.Curl())
mockedCurl.perform.side_effect = Exception('mock error (ok)')
def test_retry_write(self, sleep):
mockedCurl = mock.Mock(spec=pycurl.Curl(), wraps=pycurl.Curl())
mockedCurl.perform.side_effect = Exception('mock error (ok)')
- q =
Q
ueue.Queue()
+ q =
q
ueue.Queue()
q.put(mockedCurl)
q.put(pycurl.Curl())
q.put(pycurl.Curl())
q.put(mockedCurl)
q.put(pycurl.Curl())
q.put(pycurl.Curl())
- with mock.patch('arvados.keep.KeepClient.KeepService._get_user_agent', side_effect=
lambda: q.get(block=None)
):
+ with mock.patch('arvados.keep.KeepClient.KeepService._get_user_agent', side_effect=
q.get_nowait
):
self.pool_test(os.path.join(self.mnt, 'zzz'))
self.assertTrue(mockedCurl.perform.called)
@staticmethod
self.pool_test(os.path.join(self.mnt, 'zzz'))
self.assertTrue(mockedCurl.perform.called)
@staticmethod