openstack
/
instack-undercloud
Code Issues Proposed changes

Add unit test and release note for tuskar package removal 

In I25dcdd82803f51db456213751849443715c8fe6f we added explicit
removal of tuskar for the related bug below. This change adds
basic test and release note as requested at
https://review.openstack.org/#/c/466605/

Change-Id: I77cb4a1bf5cb880505e2f6dfefcf06d79eab23b3
Related-Bug: 1691744
This commit is contained in:
marios 2017-05-22 18:47:07 +03:00
parent 3764be5088
commit 798dfdc0dd
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
instack_undercloud/tests/test_undercloud.py
View File

@ -53,9 +53,10 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._run_instack')
@mock.patch('instack_undercloud.undercloud._generate_environment')
@mock.patch('instack_undercloud.undercloud._load_config')
def test_install(self, mock_load_config, mock_generate_environment,
mock_run_instack, mock_run_clean_all,
mock_run_yum_update, mock_run_orc,
@mock.patch('instack_undercloud.undercloud._die_tuskar_die')
def test_install(self, mock_die_tuskar_die, mock_load_config,
mock_generate_environment, mock_run_instack,
mock_run_clean_all, mock_run_yum_update, mock_run_orc,
mock_post_config, mock_run_command,
mock_validate_configuration, mock_configure_logging,
mock_upgrade_fact):
@ -69,6 +70,7 @@ class TestUndercloud(BaseTestCase):
mock_run_command.assert_called_with(
['sudo', 'rm', '-f', '/tmp/svc-map-services'], None, 'rm')
mock_upgrade_fact.assert_called_with(False)
mock_die_tuskar_die.assert_not_called()
@mock.patch('instack_undercloud.undercloud._handle_upgrade_fact')
@mock.patch('instack_undercloud.undercloud._configure_logging')
@ -81,10 +83,11 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._run_instack')
@mock.patch('instack_undercloud.undercloud._generate_environment')
@mock.patch('instack_undercloud.undercloud._load_config')
def test_install_upgrade(self, mock_load_config, mock_generate_environment,
mock_run_instack, mock_run_yum_clean_all,
mock_run_yum_update, mock_run_orc,
mock_post_config, mock_run_command,
@mock.patch('instack_undercloud.undercloud._die_tuskar_die')
def test_install_upgrade(self, mock_die_tuskar_die, mock_load_config,
mock_generate_environment, mock_run_instack,
mock_run_yum_clean_all, mock_run_yum_update,
mock_run_orc, mock_post_config, mock_run_command,
mock_validate_configuration,
mock_configure_logging, mock_upgrade_fact):
fake_env = mock.MagicMock()
@ -97,6 +100,7 @@ class TestUndercloud(BaseTestCase):
mock_run_command.assert_called_with(
['sudo', 'rm', '-f', '/tmp/svc-map-services'], None, 'rm')
mock_upgrade_fact.assert_called_with(True)
mock_die_tuskar_die.assert_called_once()
@mock.patch('instack_undercloud.undercloud._configure_logging')
def test_install_exception(self, mock_configure_logging):

10
releasenotes/notes/remove-leftover-tuskar-packages-eeba9cf583a11ee3.yaml Normal file
View File

@ -0,0 +1,10 @@
---
upgrade:
- During upgrade make sure to remove any left over tuskar packages. This
has been known to cause problems during the upgrade. See bug 1691744
for more information
fixes:
- Closes bug https://bugs.launchpad.net/tripleo/+bug/1691744 which is
caused by left-over tuskar packages. This would only affect environments
deployed with TripleoO since Kilo and for which tuskar has not explicitly
been removed.