Merge branch '21666-provision-test-improvement'

[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..5bc8a0bd454465e317ae7c38171b350ecd623c26 100644 (file)
--- a/services/fuse/tests/test_retry.py
+++ b/services/fuse/tests/test_retry.py
@@ -1,16 +1,20 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 import arvados
 import arvados_fuse.command
 import json
-import mock
 import os
 import pycurl
-import Queue
-import run_test_server
+import queue
 import tempfile
 import unittest
 
-from .integration_test import IntegrationTest
+from unittest import mock
 
+from . import run_test_server
+from .integration_test import IntegrationTest
 
 class KeepClientRetry(unittest.TestCase):
     origKeepClient = arvados.keep.KeepClient
@@ -31,8 +35,8 @@ class KeepClientRetry(unittest.TestCase):
             pass
         self.assertEqual(num_retries, kc.call_args[1].get('num_retries'))
 
-    def test_default_retry_3(self):
-        self._test_retry(3, [])
+    def test_default_retry_10(self):
+        self._test_retry(10, [])
 
     def test_retry_2(self):
         self._test_retry(2, ['--retries=2'])
@@ -46,11 +50,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)')
-        q = Queue.Queue()
+        q = queue.Queue()
         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