diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-09-27 16:08:17 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-09-27 16:08:18 +0000 |
| commit | 0908b96834f4d48b139f8c2814a2e29a78ab12a7 (patch) | |
| tree | 6ff78501fdaf46cfcca721dd5e1c2c1956453010 /heat | |
| parent | c2f22b100efd6ca3bc85a8d2f0649661168d7ed7 (diff) | |
| parent | f6982f6c950441f53739a6147588b59f306f705b (diff) | |
| download | heat-0908b96834f4d48b139f8c2814a2e29a78ab12a7.tar.gz | |
Merge "Fix heat.engine.clients.has_client"
Diffstat (limited to 'heat')
| -rw-r--r-- | heat/engine/clients/__init__.py | 2 | ||||
| -rw-r--r-- | heat/tests/test_clients.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/heat/engine/clients/__init__.py b/heat/engine/clients/__init__.py index 46046e4dd..d1e65e4fb 100644 --- a/heat/engine/clients/__init__.py +++ b/heat/engine/clients/__init__.py @@ -145,7 +145,7 @@ _mgr = None def has_client(name): - return _mgr and name in _mgr + return _mgr and name in _mgr.names() def initialise(): diff --git a/heat/tests/test_clients.py b/heat/tests/test_clients.py index c373f01c1..b0c215fcd 100644 --- a/heat/tests/test_clients.py +++ b/heat/tests/test_clients.py @@ -225,6 +225,7 @@ class TestClientPluginsInitialise(HeatTestCase): self.assertEqual(c, plugin.clients) self.assertEqual(con, plugin.context) self.assertIsNone(plugin._client) + self.assertTrue(clients.has_client(plugin_name)) class TestIsNotFound(HeatTestCase): |