From 01bd9b88c9f052234f7cb49ded4c30d6ee69fe58 Mon Sep 17 00:00:00 2001 From: Liam Young Date: Wed, 6 Jun 2018 09:53:16 +0100 Subject: [PATCH] Remove workaround for libjuju timeout bug The timeout bug for libjuju run has been resolved: https://github.com/juju/python-libjuju/commit/462989bbd919f209ebb7454305f53e4b94714487 so remove workaround. --- zaza/model.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/zaza/model.py b/zaza/model.py index 1ca7e86..6f70079 100644 --- a/zaza/model.py +++ b/zaza/model.py @@ -161,18 +161,11 @@ async def async_run_on_unit(model_name, unit_name, command, timeout=None): :type unit: str :param command: Command to execute :type command: str - :param timeout: DISABLED due to Issue #225 - https://github.com/juju/python-libjuju/issues/225 + :param timeout: How long in seconds to wait for command to complete :type timeout: int :returns: action.data['results'] {'Code': '', 'Stderr': '', 'Stdout': ''} :rtype: dict """ - - # Disabling timeout due to Issue #225 - # https://github.com/juju/python-libjuju/issues/225 - if timeout: - timeout = None - async with run_in_model(model_name) as model: unit = get_unit_from_name(unit_name, model) action = await unit.run(command, timeout=timeout)