openstack/tempest
Code Issues Proposed changes

Merge "Only call register_service_clients if there are clients"

Browse Source
This commit is contained in:
Jenkins 2016-10-06 11:18:45 +00:00 committed by Gerrit Code Review
commit c466a14448
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tempest/test_discover/plugins.py
View File

@ -157,8 +157,10 @@ class TempestTestPluginManager(object):
registry = clients.ClientsRegistry()
for plug in self.ext_plugins:
try:
registry.register_service_client(
plug.name, plug.obj.get_service_clients())
service_clients = plug.obj.get_service_clients()
if service_clients:
registry.register_service_client(
plug.name, service_clients)
except Exception:
LOG.exception('Plugin %s raised an exception trying to run '
'get_service_clients' % plug.name)

4
tempest/tests/test_tempest_plugin.py
View File

@ -75,7 +75,5 @@ class TestPluginDiscovery(base.TestCase):
fake_obj = fake_plugin.FakeStevedoreObjNoServiceClients()
manager.ext_plugins = [fake_obj]
manager._register_service_clients()
expected_result = []
registered_clients = registry.get_service_clients()
self.assertIn(fake_obj.name, registered_clients)
self.assertEqual(expected_result, registered_clients[fake_obj.name])
self.assertNotIn(fake_obj.name, registered_clients)