openstack/openstacksdk
Code Issues Proposed changes

Test python2 with py27

Browse Source 
py3 tests were running with py27. Add ignore_basepython_conflict to
tox.ini so that the basepython of python3 doesn't override the py27 env.

Change-Id: I3ff782fccbc7ffd50f703a006f63b321e673a879
This commit is contained in:
yatin 2018-11-05 17:38:47 +05:30 committed by Monty Taylor
parent 46ca87b8e8
commit ca636b92e3
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
openstack/tests/unit/cloud/test_task_manager.py
View File

@ -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'))

8
openstack/tests/unit/test_connection.py
View File

@ -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):

3
tox.ini
View File

@ -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