openstack
/
charm-cinder
Code Issues Proposed changes

Sync charm-helpers

This commit is contained in:
Corey Bryant 2015-04-15 15:23:08 +00:00
parent a873fb582d
commit 1ddd84f497
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@ -44,7 +44,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
Determine if the local branch being tested is derived from its Determine if the local branch being tested is derived from its
stable or next (dev) branch, and based on this, use the corresonding stable or next (dev) branch, and based on this, use the corresonding
stable or next branches for the other_services.""" stable or next branches for the other_services."""
base_charms = ['mysql', 'mongodb', 'rabbitmq-server'] base_charms = ['mysql', 'mongodb']
if self.stable: if self.stable:
for svc in other_services: for svc in other_services:

4
tests/charmhelpers/contrib/amulet/utils.py
View File

@ -118,6 +118,9 @@ class AmuletUtils(object):
longs, or can be a function that evaluate a variable and returns a longs, or can be a function that evaluate a variable and returns a
bool. bool.
""" """
self.log.debug('actual: {}'.format(repr(actual)))
self.log.debug('expected: {}'.format(repr(expected)))
for k, v in six.iteritems(expected): for k, v in six.iteritems(expected):
if k in actual: if k in actual:
if (isinstance(v, six.string_types) or if (isinstance(v, six.string_types) or
@ -134,7 +137,6 @@ class AmuletUtils(object):
def validate_relation_data(self, sentry_unit, relation, expected): def validate_relation_data(self, sentry_unit, relation, expected):
"""Validate actual relation data based on expected relation data.""" """Validate actual relation data based on expected relation data."""
actual = sentry_unit.relation(relation[0], relation[1]) actual = sentry_unit.relation(relation[0], relation[1])
self.log.debug('actual: {}'.format(repr(actual)))
return self._validate_dict_data(expected, actual) return self._validate_dict_data(expected, actual)
def _validate_list_data(self, expected, actual): def _validate_list_data(self, expected, actual):

2
tests/charmhelpers/contrib/openstack/amulet/deployment.py
View File

@ -44,7 +44,7 @@ class OpenStackAmuletDeployment(AmuletDeployment):
Determine if the local branch being tested is derived from its Determine if the local branch being tested is derived from its
stable or next (dev) branch, and based on this, use the corresonding stable or next (dev) branch, and based on this, use the corresonding
stable or next branches for the other_services.""" stable or next branches for the other_services."""
base_charms = ['mysql', 'mongodb', 'rabbitmq-server'] base_charms = ['mysql', 'mongodb']
if self.stable: if self.stable:
for svc in other_services: for svc in other_services: