projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '4751-node-manager-stricter-node-pairing-wip'
[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 bdba83ade10f5b30b293cf36c1c37fd6570e0137..dc8fdc3f8496b9d90d43fdabca4b922120875a6f 100644
(file)
--- a/
services/nodemanager/tests/test_daemon.py
+++ b/
services/nodemanager/tests/test_daemon.py
@@
-94,8
+94,11
@@
class NodeManagerDaemonActorTestCase(testutil.ActorTestMixin,
self.check_monitors_arvados_nodes(arv_node)
def test_arvados_node_un_and_re_paired(self):
self.check_monitors_arvados_nodes(arv_node)
def test_arvados_node_un_and_re_paired(self):
+ # We need to create the Arvados node mock after spinning up the daemon
+ # to make sure it's new enough to pair with the cloud node.
+ self.make_daemon([testutil.cloud_node_mock(3)], arvados_nodes=None)
arv_node = testutil.arvados_node_mock(3)
arv_node = testutil.arvados_node_mock(3)
- self.
make_daemon([testutil.cloud_node_mock(3)], [arv_node]
)
+ self.
daemon.update_arvados_nodes([arv_node]).get(self.TIMEOUT
)
self.check_monitors_arvados_nodes(arv_node)
self.daemon.update_cloud_nodes([]).get(self.TIMEOUT)
self.assertEqual(0, self.alive_monitor_count())
self.check_monitors_arvados_nodes(arv_node)
self.daemon.update_cloud_nodes([]).get(self.TIMEOUT)
self.assertEqual(0, self.alive_monitor_count())