Stop duplicates being added to delete_resources
Stop duplicates being added to delete_resources. Change-Id: I31a2e5e97abda0106891bcc0d9040cda00629b96
This commit is contained in:
parent
472fd77c93
commit
a85b2d23c1
|
@ -338,8 +338,9 @@ class CRM(dict):
|
|||
--------
|
||||
http://crmsh.github.io/man/#cmdhelp_configure_delete
|
||||
"""
|
||||
self['delete_resources'] = (*self['delete_resources'], resource)
|
||||
self.remove_deleted_resources()
|
||||
if resource not in self['delete_resources']:
|
||||
self['delete_resources'] = (*self['delete_resources'], resource)
|
||||
self.remove_deleted_resources()
|
||||
|
||||
def init_services(self, *resources):
|
||||
"""Specifies that the service(s) is an init or upstart service.
|
||||
|
|
|
@ -213,6 +213,14 @@ class TestHAClusterCommonCRM(unittest.TestCase):
|
|||
crm['delete_resources'],
|
||||
('grp_mysql', 'res_mysql_vip'))
|
||||
|
||||
def test_add_delete_resource_dupe(self):
|
||||
crm = common.CRM()
|
||||
crm.add_delete_resource('res_mysql_vip')
|
||||
crm.add_delete_resource('res_mysql_vip')
|
||||
self.assertEqual(
|
||||
crm['delete_resources'],
|
||||
('res_mysql_vip',))
|
||||
|
||||
def test_init_services(self):
|
||||
crm = common.CRM()
|
||||
crm.init_services('haproxy')
|
||||
|
|
Loading…
Reference in New Issue