openstack/shade
Code Issues Proposed changes

Merge "Fix AttributeError in keystone functional tests"

Browse Source
This commit is contained in:
Jenkins
2015-06-25 17:04:48 +00:00
committed by Gerrit Code Review
parent 6f93b3a253 2b64bbc7d6
commit 2fdb416e66
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shade/tests/functional/test_endpoints.py
View File

@@ -65,7 +65,8 @@ class TestEndpoints(base.TestCase):
def _cleanup_services(self):
exception_list = list()
for s in self.operator_cloud.list_services():
if s['name'].startswith(self.new_item_name):
if s['name'] is not None and \
s['name'].startswith(self.new_item_name):
try:
self.operator_cloud.delete_service(name_or_id=s['id'])
except Exception as e:

3
shade/tests/functional/test_services.py
View File

@@ -47,7 +47,8 @@ class TestServices(base.TestCase):
def _cleanup_services(self):
exception_list = list()
for s in self.operator_cloud.list_services():
if s['name'].startswith(self.new_service_name):
if s['name'] is not None and \
s['name'].startswith(self.new_service_name):
try:
self.operator_cloud.delete_service(name_or_id=s['id'])
except Exception as e: