diff --git a/daliuge-engine/setup.py b/daliuge-engine/setup.py index b9baf866d..5fd9fb0b7 100644 --- a/daliuge-engine/setup.py +++ b/daliuge-engine/setup.py @@ -118,6 +118,7 @@ def run(self): install_requires = [ "wheel", # need to get wheel first... "bottle", + "boto3", "configobj", "crc32c", "daliuge-common==%s" % (VERSION,), @@ -136,7 +137,7 @@ def run(self): "scp", "pyyaml", # 0.19.0 requires netifaces < 0.10.5, exactly the opposite of what *we* need - "zeroconf >= 0.19.1", + "zeroconf ~= 0.38.4", # 0.6 brings python3 support plus other fixes "zerorpc ~= 0.6.3", ] diff --git a/daliuge-engine/test/manager/test_daemon.py b/daliuge-engine/test/manager/test_daemon.py index 80c7a0aec..d768e34e4 100644 --- a/daliuge-engine/test/manager/test_daemon.py +++ b/daliuge-engine/test/manager/test_daemon.py @@ -30,9 +30,10 @@ from dlg.manager.client import MasterManagerClient from dlg.manager.proc_daemon import DlgDaemon -_TIMEOUT = 10 +_TIMEOUT = 30 IDENTITY = lambda x: x + def wait_until(update_condition, test_condition=IDENTITY, timeout=_TIMEOUT, interval=0.1): timeout_time = time.time() + timeout while time.time() < timeout_time: @@ -157,6 +158,7 @@ def _test_zeroconf_dim_mm(self, disable_zeroconf=False): if not disable_zeroconf: def _test_dims(dims): return dims and dims["islands"] + dims = _get_dims_from_client(mc, test_condition=_test_dims) self.assertIsNotNone(dims) return dims