← Back to branch summary

~hopem/charms/trusty/glance/charm-helpers-sync-precise-ipv6-haproxy

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2014-12-15 09:17:53 UTC
  • mfrom: (82.1.8 glance)
  • Revision ID: james.page@ubuntu.com-20141215091753-23bixw725p75pcdp
[corey.bryant,r=james-page] Sort out charmhelpers issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/amulet/utils.py
5
5
import sys
6
6
import time
7
7
 
 
8
import six
 
9
 
8
10
 
9
11
class AmuletUtils(object):
10
12
    """Amulet utilities.
58
60
           Verify the specified services are running on the corresponding
59
61
           service units.
60
62
           """
61
 
        for k, v in commands.iteritems():
 
63
        for k, v in six.iteritems(commands):
62
64
            for cmd in v:
63
65
                output, code = k.run(cmd)
64
66
                if code != 0:
100
102
           longs, or can be a function that evaluate a variable and returns a
101
103
           bool.
102
104
           """
103
 
        for k, v in expected.iteritems():
 
105
        for k, v in six.iteritems(expected):
104
106
            if k in actual:
105
 
                if (isinstance(v, basestring) or
 
107
                if (isinstance(v, six.string_types) or
106
108
                        isinstance(v, bool) or
107
 
                        isinstance(v, (int, long))):
 
109
                        isinstance(v, six.integer_types)):
108
110
                    if v != actual[k]:
109
111
                        return "{}:{}".format(k, actual[k])
110
112
                elif not v(actual[k]):