Fix typo in configure ttl code

Also fixes tox.ini

Change-Id: Ic4c2d34ff248d5429eb604824e42dbaba6ca2678
Closes-Bug: #1939681
This commit is contained in:
Edward Hope-Morley 2023-04-03 14:30:34 +01:00
parent 58b1693f63
commit 8c9f68e8aa
3 changed files with 3 additions and 3 deletions

View File

@ -884,7 +884,7 @@ def configure_ttl(vhost, ttlname, ttlreg, ttl):
set_policy( set_policy(
vhost, vhost,
'{ttlname}'.format(ttlname=ttlname), '{ttlname}'.format(ttlname=ttlname),
'"{ttlreg}"'.format(ttlreg=ttlreg), '{ttlreg}'.format(ttlreg=ttlreg),
'{{"expires":{ttl}}}'.format(ttl=ttl), '{{"expires":{ttl}}}'.format(ttl=ttl),
priority='1', priority='1',
apply_to='queues') apply_to='queues')

View File

@ -25,7 +25,7 @@ setenv = VIRTUAL_ENV={envdir}
commands = stestr run --slowest {posargs} commands = stestr run --slowest {posargs}
allowlist_externals = allowlist_externals =
charmcraft charmcraft
rename.sh {toxinidir}/rename.sh
passenv = passenv =
HOME HOME
TERM TERM

View File

@ -1067,7 +1067,7 @@ class UtilsTests(CharmTestCase):
'-p', 'test', '-p', 'test',
'--priority', '1', '--priority', '1',
'--apply-to', 'queues', '--apply-to', 'queues',
'heat_expiry', '"heat-engine-listener|engine_worker"', 'heat_expiry', 'heat-engine-listener|engine_worker',
'{"expires":23000}' '{"expires":23000}'
) )