openstack
/
heat
Code Issues Proposed changes

Merge "Halt test_cinder_volume_create_backup_restore on error"

This commit is contained in:
Jenkins 2014-10-22 09:24:44 +00:00 committed by Gerrit Code Review
parent 5993971832 d16a32886b
commit aeb8cf8ff0
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
heat_integrationtests/scenario/test_volumes.py
View File

@ -15,6 +15,7 @@ import six
from cinderclient import exceptions as cinder_exceptions
from heat_integrationtests.common import exceptions
from heat_integrationtests.common import test
LOG = logging.getLogger(__name__)
@ -114,9 +115,14 @@ class VolumeBackupRestoreIntegrationTest(test.HeatIntegrationTest):
# Now, we create another stack where the volume is created from the
# backup created by the previous stack
stack2, stack_identifier2 = self._create_stack(
template_name='test_volumes_create_from_backup.yaml',
add_parameters={'backup_id': backup.id})
try:
stack2, stack_identifier2 = self._create_stack(
template_name='test_volumes_create_from_backup.yaml',
add_parameters={'backup_id': backup.id})
except exceptions.StackBuildErrorException as e:
LOG.error("Halting test due to bug: #1382300")
LOG.exception(e)
return
# Verify with cinder that the volume exists, with matching details
volume_id2 = self._stack_output(stack2, 'volume_id')