From 5d66eb7f5ba7d2dc8da03ee82d2877458e06d81c Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Thu, 18 Feb 2016 18:15:44 +0200 Subject: [PATCH] Fix cleanup manager with api_versions context Cleanup manager was broken in cases when api_versions context was used. Change-Id: Ifebfa5abf43e620f6b82d4649e5a454172e99c38 Closes-Bug: #1547083 --- rally/plugins/openstack/cleanup/manager.py | 3 ++- tests/unit/plugins/openstack/cleanup/test_manager.py | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/rally/plugins/openstack/cleanup/manager.py b/rally/plugins/openstack/cleanup/manager.py index 8a11bb56..bac5bc35 100644 --- a/rally/plugins/openstack/cleanup/manager.py +++ b/rally/plugins/openstack/cleanup/manager.py @@ -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] diff --git a/tests/unit/plugins/openstack/cleanup/test_manager.py b/tests/unit/plugins/openstack/cleanup/test_manager.py index 56fa2bf4..ea93185e 100644 --- a/tests/unit/plugins/openstack/cleanup/test_manager.py +++ b/tests/unit/plugins/openstack/cleanup/test_manager.py @@ -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"}