Merge "Fix all py3 related issues"

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]

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)

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."""

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