← Back to branch summary

~hopem/charms/trusty/nova-cloud-controller/grizzly

« back to all changes in this revision

Viewing changes to tests/charmhelpers/contrib/amulet/utils.py

  • Committer: Liam Young
  • Date: 2015-04-16 10:25:41 UTC
  • Revision ID: liam.young@canonical.com-20150416102541-ngts1h70zwq3x6al
[gnuoy,trivial] Pre-release charmhelper sync

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/amulet/utils.py
118
118
           longs, or can be a function that evaluate a variable and returns a
119
119
           bool.
120
120
           """
 
121
        self.log.debug('actual: {}'.format(repr(actual)))
 
122
        self.log.debug('expected: {}'.format(repr(expected)))
 
123
 
121
124
        for k, v in six.iteritems(expected):
122
125
            if k in actual:
123
126
                if (isinstance(v, six.string_types) or
134
137
    def validate_relation_data(self, sentry_unit, relation, expected):
135
138
        """Validate actual relation data based on expected relation data."""
136
139
        actual = sentry_unit.relation(relation[0], relation[1])
137
 
        self.log.debug('actual: {}'.format(repr(actual)))
138
140
        return self._validate_dict_data(expected, actual)
139
141
 
140
142
    def _validate_list_data(self, expected, actual):