openstack/heat
Code Issues Proposed changes

Merge "Correct reraising of exception"

Browse Source
This commit is contained in:
Jenkins 2016-07-26 00:39:41 +00:00 committed by Gerrit Code Review
commit 97a7e96e24
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat_integrationtests/scenario/test_server_cfn_init.py
View File

@ -36,9 +36,6 @@ class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
try: try:
self._wait_for_resource_status( self._wait_for_resource_status(
sid, 'WaitCondition', 'CREATE_COMPLETE') sid, 'WaitCondition', 'CREATE_COMPLETE')
except (exceptions.StackResourceBuildErrorException,
exceptions.TimeoutException) as e:
raise e
finally: finally:
# attempt to log the server console regardless of WaitCondition # attempt to log the server console regardless of WaitCondition
# going to complete. This allows successful and failed cloud-init # going to complete. This allows successful and failed cloud-init
@ -87,9 +84,9 @@ class CfnInitIntegrationTest(scenario_base.ScenarioTestsBase):
server_ip, username='ec2-user') server_ip, username='ec2-user')
linux_client.validate_authentication() linux_client.validate_authentication()
except (exceptions.ServerUnreachable, except (exceptions.ServerUnreachable,
exceptions.SSHTimeout) as e: exceptions.SSHTimeout):
self._log_console_output(servers=[server]) self._log_console_output(servers=[server])
raise e raise
def test_server_cfn_init(self): def test_server_cfn_init(self):
"""Check cfn-init and cfn-signal availability on the created server. """Check cfn-init and cfn-signal availability on the created server.

4
heat_integrationtests/scenario/test_server_software_config.py
View File

@ -13,7 +13,6 @@
from heatclient.common import template_utils from heatclient.common import template_utils
import six import six
from heat_integrationtests.common import exceptions
from heat_integrationtests.scenario import scenario_base from heat_integrationtests.scenario import scenario_base
CFG1_SH = '''#!/bin/sh CFG1_SH = '''#!/bin/sh
@ -69,9 +68,6 @@ class SoftwareConfigIntegrationTest(scenario_base.ScenarioTestsBase):
for res in ('dep2a', 'dep2b', 'dep1', 'dep3'): for res in ('dep2a', 'dep2b', 'dep1', 'dep3'):
self._wait_for_resource_status( self._wait_for_resource_status(
sid, res, 'CREATE_COMPLETE') sid, res, 'CREATE_COMPLETE')
except (exceptions.StackResourceBuildErrorException,
exceptions.TimeoutException) as e:
raise e
finally: finally:
# attempt to log the server console regardless of deployments # attempt to log the server console regardless of deployments
# going to complete. This allows successful and failed boot # going to complete. This allows successful and failed boot