From 86e23c3df558b1754b29680ce7e56bdcf08b3d5d Mon Sep 17 00:00:00 2001 From: Ryan Bunney Date: Fri, 13 Dec 2024 13:32:14 +0800 Subject: [PATCH] Test if changes to discovery tests fail on remote tests --- daliuge-engine/test/manager/test_daemon.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/daliuge-engine/test/manager/test_daemon.py b/daliuge-engine/test/manager/test_daemon.py index ee40961a4..ab333e124 100644 --- a/daliuge-engine/test/manager/test_daemon.py +++ b/daliuge-engine/test/manager/test_daemon.py @@ -32,7 +32,10 @@ from dlg.manager.proc_daemon import DlgDaemon _TIMEOUT = 5 -IDENTITY = lambda x: x + + +def IDENTITY(x): + return x def wait_until( @@ -136,14 +139,13 @@ def test_nothing_starts(self): ) def test_zeroconf_discovery(self): - self.create_daemon(master=True, noNM=False, disable_zeroconf=False) # Both managers started fine. If they zeroconf themselves correctly then # if we query the MM it should know about its nodes, which should have # one element mc = MasterManagerClient() - nodes = _get_nodes_from_client(mc) + nodes = _get_nodes_from_client(mc)["nodes"] self.assertIsNotNone(nodes) self.assertEqual( 1, @@ -219,7 +221,6 @@ def _test_nodes(nodes): self.assertEqual(0, len(new_nodes)) def test_start_dataisland_via_rest(self): - self.create_daemon(master=True, noNM=False, disable_zeroconf=False) # Both managers started fine. If they zeroconf themselves correctly then @@ -242,7 +243,6 @@ def test_start_dataisland_via_rest(self): ) def test_stop_dataisland_via_rest(self): - # start master and island manager self.create_daemon(master=True, noNM=False, disable_zeroconf=False) mc = MasterManagerClient() @@ -271,7 +271,6 @@ def test_stop_dataisland_via_rest(self): ) def test_stop_start_node_via_rest(self): - # test both stop and start of NM via REST self.create_daemon(master=True, noNM=False, disable_zeroconf=False)