diff --git a/hooks/rabbit_utils.py b/hooks/rabbit_utils.py index 99af07a9..ad42930e 100644 --- a/hooks/rabbit_utils.py +++ b/hooks/rabbit_utils.py @@ -884,7 +884,7 @@ def configure_ttl(vhost, ttlname, ttlreg, ttl): set_policy( vhost, '{ttlname}'.format(ttlname=ttlname), - '"{ttlreg}"'.format(ttlreg=ttlreg), + '{ttlreg}'.format(ttlreg=ttlreg), '{{"expires":{ttl}}}'.format(ttl=ttl), priority='1', apply_to='queues') diff --git a/tox.ini b/tox.ini index 3ea16f60..55119d8f 100644 --- a/tox.ini +++ b/tox.ini @@ -25,7 +25,7 @@ setenv = VIRTUAL_ENV={envdir} commands = stestr run --slowest {posargs} allowlist_externals = charmcraft - rename.sh + {toxinidir}/rename.sh passenv = HOME TERM diff --git a/unit_tests/test_rabbit_utils.py b/unit_tests/test_rabbit_utils.py index 232976a6..5f61f5ba 100644 --- a/unit_tests/test_rabbit_utils.py +++ b/unit_tests/test_rabbit_utils.py @@ -1067,7 +1067,7 @@ class UtilsTests(CharmTestCase): '-p', 'test', '--priority', '1', '--apply-to', 'queues', - 'heat_expiry', '"heat-engine-listener|engine_worker"', + 'heat_expiry', 'heat-engine-listener|engine_worker', '{"expires":23000}' )