projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
8816: Use is_cloud_exception to determine if exception is a "cloud error". Add
[arvados.git]
/
services
/
nodemanager
/
tests
/
test_daemon.py
diff --git
a/services/nodemanager/tests/test_daemon.py
b/services/nodemanager/tests/test_daemon.py
index 554fb88b4723463884f408bbb4454b279a208387..2daca08ecf7eb114173725bb88deff2969ad5bf3 100644
(file)
--- a/
services/nodemanager/tests/test_daemon.py
+++ b/
services/nodemanager/tests/test_daemon.py
@@
-59,6
+59,7
@@
class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.cloud_factory().node_start_time.return_value = time.time()
self.cloud_updates = mock.MagicMock(name='updates_mock')
self.timer = testutil.MockTimer(deliver_immediately=False)
self.cloud_factory().node_start_time.return_value = time.time()
self.cloud_updates = mock.MagicMock(name='updates_mock')
self.timer = testutil.MockTimer(deliver_immediately=False)
+ self.cloud_factory().node_id.side_effect = lambda node: node.id
self.node_setup = mock.MagicMock(name='setup_mock')
self.node_setup.start.side_effect = self.mock_node_start
self.node_setup = mock.MagicMock(name='setup_mock')
self.node_setup.start.side_effect = self.mock_node_start
@@
-123,7
+124,7
@@
class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
def test_node_pairing_after_arvados_update(self):
cloud_node = testutil.cloud_node_mock(2)
self.make_daemon([cloud_node],
def test_node_pairing_after_arvados_update(self):
cloud_node = testutil.cloud_node_mock(2)
self.make_daemon([cloud_node],
- [testutil.arvados_node_mock(
2
, ip_address=None)])
+ [testutil.arvados_node_mock(
1
, ip_address=None)])
arv_node = testutil.arvados_node_mock(2)
self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT)
self.stop_proxy(self.daemon)
arv_node = testutil.arvados_node_mock(2)
self.daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT)
self.stop_proxy(self.daemon)