8931: Fix indentation mistakes. Fix tests.

diff --git a/sdk/python/arvados/events.py b/sdk/python/arvados/events.py
index 4985aaf1b7512596125f06c39ca5958f9a9bf6ad..d88897f1234329b5294bedb1da4e4104f9720b4e 100644 (file)
--- a/sdk/python/arvados/events.py
+++ b/sdk/python/arvados/events.py
@@ -116,14 +116,14 @@ class EventClient(object):
     def on_closed(self):
         if self.is_closed == False:
             _logger.warn("Unexpected close. Reconnecting.")
-          for tries_left in RetryLoop(num_retries=25, backoff_start=.1, max_wait=15):
-              try:
-                  self.ec = _EventClient(self.url, self.filters, self.on_event, self.last_log_id, self.on_closed)
-                  self.ec.connect()
-                  break
-              except Exception as e:
-                  _logger.warn("Error '%s' during websocket reconnect.", e)
-           if tries_left == 0:
+            for tries_left in RetryLoop(num_retries=25, backoff_start=.1, max_wait=15):
+                try:
+                    self.ec = _EventClient(self.url, self.filters, self.on_event, self.last_log_id, self.on_closed)
+                    self.ec.connect()
+                    break
+                except Exception as e:
+                    _logger.warn("Error '%s' during websocket reconnect.", e)
+            if tries_left == 0:
                 _logger.exception("EventClient thread could not contact websocket server.")
                 self.is_closed = True
                 thread.interrupt_main()

diff --git a/sdk/python/tests/test_retry.py b/sdk/python/tests/test_retry.py
index c41c42e762cd5e8f856444926716b0c274735bb5..cc12f39a355ef9b97a85a34ee5989e3bae38a744 100644 (file)
--- a/sdk/python/tests/test_retry.py
+++ b/sdk/python/tests/test_retry.py
@@ -141,7 +141,7 @@ class RetryLoopBackoffTestCase(unittest.TestCase, RetryLoopTestMixin):
 
     def test_backoff_multiplier(self, sleep_mock, time_mock):
         self.run_loop(5, 500, 501, 502, 503, 504, 505,
-                      backoff_start=5, backoff_growth=10)
+                      backoff_start=5, backoff_growth=10, max_wait=1000000000)
         self.check_backoff(sleep_mock, 5, 9)
 
 

diff --git a/sdk/python/tests/test_websockets.py b/sdk/python/tests/test_websockets.py
index 475628ac11be3855858ac4d4ddea8c7dc968da8a..d122a1cf42570a71b9a953f2a15636b6cd50ee33 100644 (file)
--- a/sdk/python/tests/test_websockets.py
+++ b/sdk/python/tests/test_websockets.py
@@ -242,6 +242,6 @@ class WebsocketTest(run_test_server.TestCaseWithServers):
 
         # verify log messages to ensure retry happened
         log_messages = logstream.getvalue()
-        found = log_messages.find("Error 'EventClient.connect error' during websocket reconnect. Will retry")
+        found = log_messages.find("Error 'EventClient.connect error' during websocket reconnect.")
         self.assertNotEqual(found, -1)
         rootLogger.removeHandler(streamHandler)