diff --git a/openstack/tests/unit/cloud/test_task_manager.py b/openstack/tests/unit/cloud/test_task_manager.py index fd8907199..89fc2dfce 100644 --- a/openstack/tests/unit/cloud/test_task_manager.py +++ b/openstack/tests/unit/cloud/test_task_manager.py @@ -78,8 +78,8 @@ class TestRateTransforms(base.TestCase): 'compute': 20, 'network': 10, }) - self.assertEqual(1 / 20, manager._get_wait('compute')) - self.assertEqual(1 / 10, manager._get_wait('network')) + self.assertEqual(1.0 / 20, manager._get_wait('compute')) + self.assertEqual(1.0 / 10, manager._get_wait('network')) self.assertIsNone(manager._get_wait('object-store')) diff --git a/openstack/tests/unit/test_connection.py b/openstack/tests/unit/test_connection.py index 84e54b37b..936b11b01 100644 --- a/openstack/tests/unit/test_connection.py +++ b/openstack/tests/unit/test_connection.py @@ -93,8 +93,8 @@ class TestConnection(base.TestCase): def test_task_manager_rate_scalar(self): conn = connection.Connection(cloud='sample-cloud', rate_limit=20) - self.assertEqual(1 / 20, conn.task_manager._get_wait('object-store')) - self.assertEqual(1 / 20, conn.task_manager._get_wait(None)) + self.assertEqual(1.0 / 20, conn.task_manager._get_wait('object-store')) + self.assertEqual(1.0 / 20, conn.task_manager._get_wait(None)) def test_task_manager_rate_dict(self): conn = connection.Connection( @@ -103,8 +103,8 @@ class TestConnection(base.TestCase): 'compute': 20, 'network': 10, }) - self.assertEqual(1 / 20, conn.task_manager._get_wait('compute')) - self.assertEqual(1 / 10, conn.task_manager._get_wait('network')) + self.assertEqual(1.0 / 20, conn.task_manager._get_wait('compute')) + self.assertEqual(1.0 / 10, conn.task_manager._get_wait('network')) self.assertIsNone(conn.task_manager._get_wait('object-store')) def test_create_session(self): diff --git a/tox.ini b/tox.ini index c6d500e53..ad02bfe85 100644 --- a/tox.ini +++ b/tox.ini @@ -1,7 +1,8 @@ [tox] -minversion = 2.0 +minversion = 3.1 envlist = py35,py36,py27,pep8 skipsdist = True +ignore_basepython_conflict = True [testenv] usedevelop = True