16535: Use package consts for http methods.

[arvados.git] / services / nodemanager / tests / test_clientactor.py

diff --git a/services/nodemanager/tests/test_clientactor.py b/services/nodemanager/tests/test_clientactor.py
index 0db0a33e3d83a203c103bc2a31e806f6a819691e..19e094d97a7618b54cf725705f87d166abcc6908 100644 (file)
--- a/services/nodemanager/tests/test_clientactor.py
+++ b/services/nodemanager/tests/test_clientactor.py
@@ -1,4 +1,7 @@
 #!/usr/bin/env python
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
 from __future__ import absolute_import, print_function
 
@@ -30,26 +33,28 @@ class RemotePollLoopActorTestCase(testutil.RemotePollLoopActorTestMixin,
 
     def test_poll_loop_starts_after_subscription(self):
         self.build_monitor(['test1'])
-        self.monitor.subscribe(self.subscriber)
-        self.wait_for_call(self.subscriber)
+        self.monitor.subscribe(self.subscriber).get(self.TIMEOUT)
+        self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with('test1')
-        self.wait_for_call(self.timer.schedule)
+        self.assertTrue(self.timer.schedule.called)
 
     def test_poll_loop_continues_after_failure(self):
         self.build_monitor(self.MockClientError)
-        self.monitor.subscribe(self.subscriber)
-        self.wait_for_call(self.timer.schedule)
-        self.assertTrue(self.monitor.actor_ref.is_alive(),
+        self.monitor.subscribe(self.subscriber).get(self.TIMEOUT)
+        self.assertTrue(self.stop_proxy(self.monitor),
                         "poll loop died after error")
+        self.assertTrue(self.timer.schedule.called,
+                        "poll loop did not reschedule after error")
         self.assertFalse(self.subscriber.called,
                          "poll loop notified subscribers after error")
 
     def test_late_subscribers_get_responses(self):
-        self.build_monitor(['late_test'])
-        self.monitor.subscribe(lambda response: None)
+        self.build_monitor(['pre_late_test', 'late_test'])
+        mock_subscriber = mock.Mock(name='mock_subscriber')
+        self.monitor.subscribe(mock_subscriber).get(self.TIMEOUT)
         self.monitor.subscribe(self.subscriber)
-        self.monitor.poll()
-        self.wait_for_call(self.subscriber)
+        self.monitor.poll().get(self.TIMEOUT)
+        self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with('late_test')
 
     def test_survive_dead_subscriptions(self):
@@ -57,13 +62,36 @@ class RemotePollLoopActorTestCase(testutil.RemotePollLoopActorTestMixin,
         dead_subscriber = mock.Mock(name='dead_subscriber')
         dead_subscriber.side_effect = pykka.ActorDeadError
         self.monitor.subscribe(dead_subscriber)
-        self.wait_for_call(dead_subscriber)
         self.monitor.subscribe(self.subscriber)
-        self.monitor.poll()
-        self.wait_for_call(self.subscriber)
-        self.subscriber.assert_called_with('survive2')
-        self.assertTrue(self.monitor.actor_ref.is_alive(),
+        self.monitor.poll().get(self.TIMEOUT)
+        self.assertTrue(self.stop_proxy(self.monitor),
                         "poll loop died from dead subscriber")
+        self.subscriber.assert_called_with('survive2')
+
+    def check_poll_timers(self, *test_times):
+        schedule_mock = self.timer.schedule
+        last_expect = None
+        with mock.patch('time.time') as time_mock:
+            for fake_time, expect_next in test_times:
+                time_mock.return_value = fake_time
+                self.monitor.poll(last_expect).get(self.TIMEOUT)
+                self.assertTrue(schedule_mock.called)
+                self.assertEqual(expect_next, schedule_mock.call_args[0][0])
+                schedule_mock.reset_mock()
+                last_expect = expect_next
+
+    def test_poll_timing_on_consecutive_successes_with_drift(self):
+        self.build_monitor(['1', '2'], poll_wait=3, max_poll_wait=14)
+        self.check_poll_timers((0, 3), (4, 6))
+
+    def test_poll_backoff_on_failures(self):
+        self.build_monitor(self.MockClientError, poll_wait=3, max_poll_wait=14)
+        self.check_poll_timers((0, 6), (6, 18), (18, 32))
+
+    def test_poll_timing_after_error_recovery(self):
+        self.build_monitor(['a', self.MockClientError(), 'b'],
+                           poll_wait=3, max_poll_wait=14)
+        self.check_poll_timers((0, 3), (4, 10), (10, 13))
 
     def test_no_subscriptions_by_key_without_support(self):
         self.build_monitor([])
@@ -86,8 +114,8 @@ class RemotePollLoopActorWithKeysTestCase(testutil.RemotePollLoopActorTestMixin,
 
     def test_key_subscription(self):
         self.build_monitor([[{'key': 1}, {'key': 2}]])
-        self.monitor.subscribe_to(2, self.subscriber)
-        self.wait_for_call(self.subscriber)
+        self.monitor.subscribe_to(2, self.subscriber).get(self.TIMEOUT)
+        self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with({'key': 2})
 
     def test_survive_dead_key_subscriptions(self):
@@ -96,13 +124,11 @@ class RemotePollLoopActorWithKeysTestCase(testutil.RemotePollLoopActorTestMixin,
         dead_subscriber = mock.Mock(name='dead_subscriber')
         dead_subscriber.side_effect = pykka.ActorDeadError
         self.monitor.subscribe_to(3, dead_subscriber)
-        self.wait_for_call(dead_subscriber)
         self.monitor.subscribe_to(3, self.subscriber)
-        self.monitor.poll()
-        self.wait_for_call(self.subscriber)
-        self.subscriber.assert_called_with(item)
-        self.assertTrue(self.monitor.actor_ref.is_alive(),
+        self.monitor.poll().get(self.TIMEOUT)
+        self.assertTrue(self.stop_proxy(self.monitor),
                         "poll loop died from dead key subscriber")
+        self.subscriber.assert_called_with(item)
 
     def test_mixed_subscriptions(self):
         item = {'key': 4}
@@ -110,18 +136,17 @@ class RemotePollLoopActorWithKeysTestCase(testutil.RemotePollLoopActorTestMixin,
         key_subscriber = mock.Mock(name='key_subscriber')
         self.monitor.subscribe(self.subscriber)
         self.monitor.subscribe_to(4, key_subscriber)
-        self.monitor.poll()
-        self.wait_for_call(self.subscriber)
+        self.monitor.poll().get(self.TIMEOUT)
+        self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with([item])
         key_subscriber.assert_called_with(item)
 
     def test_subscription_to_missing_key(self):
         self.build_monitor([[]])
-        self.monitor.subscribe_to('nonesuch', self.subscriber)
-        self.wait_for_call(self.subscriber)
+        self.monitor.subscribe_to('nonesuch', self.subscriber).get(self.TIMEOUT)
+        self.stop_proxy(self.monitor)
         self.subscriber.assert_called_with(None)
 
 
 if __name__ == '__main__':
     unittest.main()
-