openstack/tempest
Code Issues Proposed changes

Clean up pep8 E125 violations

Browse Source 
Fixed E125 errors
E125 is ignored because of false alarms
All ignores are to be removed in the next sequence of patches

Change-Id: Id9ce27d1348a9318e183591db79232a01731f8ad
This commit is contained in:
Zhongyue Luo 2012-09-30 23:58:52 +09:00
parent 30a563fc87
commit 76888eecde
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
stress/test_server_actions.py
View File

@ -103,9 +103,9 @@ class VerifyRebootVM(pending_action.PendingServerAction):
"""
# don't run reboot verification if target machine has been
# deleted or is going to be deleted
target_id = self._target['id']
if (self._target['id'] not in self._state.get_instances().keys() or
self._state.get_instances()[self._target['id']][1] ==
'TERMINATING'):
self._state.get_instances()[target_id][1] == 'TERMINATING'):
self._logger.debug('machine %s is deleted or TERMINATING' %
self._target['id'])
return True

8
stress/test_servers.py
View File

@ -118,9 +118,9 @@ class VerifyCreateVM(pending_action.PendingServerAction):
"""
# don't run create verification
# if target machine has been deleted or is going to be deleted
target_id = self._target['id']
if (self._target['id'] not in self._state.get_instances().keys() or
self._state.get_instances()[self._target['id']][1] ==
'TERMINATING'):
self._state.get_instances()[target_id][1] == 'TERMINATING'):
self._logger.info('machine %s is deleted or TERMINATING' %
self._target['id'])
return True
@ -299,9 +299,9 @@ class VerifyUpdateVMName(pending_action.PendingServerAction):
"""
# don't run update verification
# if target machine has been deleted or is going to be deleted
target_id = self._target['id']
if (not self._target['id'] in self._state.get_instances().keys() or
self._state.get_instances()[self._target['id']][1] ==
'TERMINATING'):
self._state.get_instances()[target_id][1] == 'TERMINATING'):
return False
response, body = \

4
tempest/common/rest_client.py
View File

@ -138,8 +138,8 @@ class RestClient(object):
tenant_id = auth_data['token']['tenant']['id']
break
elif ep["type"] == service and ep['name'] == 'cinder' \
and service == 'volume':
elif (ep["type"] == service and ep['name'] == 'cinder' and
service == 'volume'):
mgmt_url = ep['endpoints'][self.region][self.endpoint_url]
tenant_id = auth_data['token']['tenant']['id']
break