openstack/rally-openstack
Code Issues Proposed changes

Fix cleanup manager with api_versions context

Browse Source 
Cleanup manager was broken in cases when api_versions context was used.

Change-Id: Ifebfa5abf43e620f6b82d4649e5a454172e99c38
Closes-Bug: #1547083
This commit is contained in:
Andrey Kurilin
2016-02-18 18:15:44 +02:00
parent 59a9b5559e
commit 5d66eb7f5b
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rally/plugins/openstack/cleanup/manager.py
View File

@@ -59,7 +59,8 @@ class SeekAndDestroy(object):
else:
key = user["credential"]
if key not in cache:
cache[key] = osclients.Clients(key, api_info=api_versions)
cache[key] = osclients.Clients(user["credential"],
api_info=api_versions)
return cache[key]

8
tests/unit/plugins/openstack/cleanup/test_manager.py
View File

@@ -26,9 +26,7 @@ BASE = "rally.plugins.openstack.cleanup.manager"
class SeekAndDestroyTestCase(test.TestCase):
@mock.patch("%s.osclients.Clients" % BASE,
side_effect=[mock.MagicMock(), mock.MagicMock()])
def test__get_cached_client(self, mock_clients):
def test__get_cached_client(self):
self.assertIsNone(manager.SeekAndDestroy._get_cached_client(None))
users = [{"credential": "a"}, {"credential": "b"}]
@@ -47,9 +45,7 @@ class SeekAndDestroyTestCase(test.TestCase):
manager.SeekAndDestroy._get_cached_client(users[0], cache=cache),
manager.SeekAndDestroy._get_cached_client(users[1], cache=cache))
@mock.patch("%s.osclients.Clients" % BASE,
side_effect=[mock.MagicMock(), mock.MagicMock()])
def test__get_cached_client_with_api_versions(self, mock_clients):
def test__get_cached_client_with_api_versions(self):
self.assertIsNone(manager.SeekAndDestroy._get_cached_client(None))
user = {"credential": "a"}