Merge "Force resolve configs after openstack-upgrade action"
This commit is contained in:
commit
c2c1be3070
|
@ -54,6 +54,7 @@ def openstack_upgrade():
|
||||||
if do_action_openstack_upgrade('openstack-dashboard',
|
if do_action_openstack_upgrade('openstack-dashboard',
|
||||||
do_openstack_upgrade,
|
do_openstack_upgrade,
|
||||||
CONFIGS):
|
CONFIGS):
|
||||||
|
resolve_CONFIGS(force_update=True)
|
||||||
config_changed()
|
config_changed()
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
import os
|
import os
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
from unittest.mock import patch, MagicMock
|
from unittest.mock import call, patch, MagicMock
|
||||||
|
|
||||||
os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard'
|
os.environ['JUJU_UNIT_NAME'] = 'openstack-dashboard'
|
||||||
|
|
||||||
|
@ -58,6 +58,10 @@ class TestHorizonUpgradeActions(CharmTestCase):
|
||||||
'openstack-dashboard',
|
'openstack-dashboard',
|
||||||
self.do_openstack_upgrade,
|
self.do_openstack_upgrade,
|
||||||
'configs')
|
'configs')
|
||||||
|
self.resolve_CONFIGS.assert_has_calls([
|
||||||
|
call(),
|
||||||
|
call(force_update=True),
|
||||||
|
])
|
||||||
self.config_changed.assert_called_once_with()
|
self.config_changed.assert_called_once_with()
|
||||||
|
|
||||||
def test_openstack_upgrade_false(self):
|
def test_openstack_upgrade_false(self):
|
||||||
|
|
Loading…
Reference in New Issue