diff --git a/setup.cfg b/setup.cfg index 7640396f..013722b4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,6 +15,7 @@ classifier = Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 2 + Programming Language :: Python :: 2.6 Programming Language :: Python :: 2.7 [files] diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py index 2a033d8c..3a3254a9 100644 --- a/tests/unit/fakes.py +++ b/tests/unit/fakes.py @@ -70,11 +70,11 @@ def setup_dict(data, required=None, defaults=None): :raises: IndexError, ValueError """ required = required or [] - for i in set(required) - set(data.keys()): + for i in set(required) - set(data): raise IndexError("Missed: %s" % i) defaults = defaults or {} - for i in set(data.keys()) - set(required + defaults.keys()): + for i in set(data) - set(required) - set(defaults): raise ValueError("Unexpected: %s" % i) defaults.update(data) diff --git a/tests/unit/test.py b/tests/unit/test.py index f5843792..385d75e1 100644 --- a/tests/unit/test.py +++ b/tests/unit/test.py @@ -45,6 +45,9 @@ class TestCase(base.BaseTestCase): self.assertIsNotNone(action_duration) self.assertIsInstance(action_duration, float) + def assertSequenceEqual(self, iterable_1, iterable_2): + self.assertEqual(tuple(iterable_1), tuple(iterable_2)) + class DBTestCase(TestCase): """Base class for tests which use DB.""" diff --git a/tox.ini b/tox.ini index 35f52d04..1f93b9fa 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,7 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py26,py27,pep8 +envlist = py26,py27,py33,py34,pep8 [testenv] setenv = VIRTUAL_ENV={envdir} @@ -41,7 +41,7 @@ downloadcache = ~/cache/pip ignore = E126,H703 show-source = true builtins = _ -exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,*rally/verification/verifiers/tempest/openstack-tempest*,build,*rally/openstack* +exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools,build,*rally/openstack* [hacking] import_exceptions = rally.common.i18n