openstack/rally
Code Issues Proposed changes

Merge "Fix error status for get_from_manager method"

Browse Source
This commit is contained in:
Jenkins 2014-10-13 16:00:14 +00:00 committed by Gerrit Code Review
commit 96a4fe431f
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rally/benchmark/scenarios/heat/utils.py
View File

@ -94,7 +94,7 @@ class HeatScenario(base.Scenario):
stack = bench_utils.wait_for(
stack,
is_ready=heat_resource_is("CREATE_COMPLETE"),
update_resource=bench_utils.get_from_manager("CREATE_FAILED"),
update_resource=bench_utils.get_from_manager(["CREATE_FAILED"]),
timeout=CONF.benchmark.heat_stack_create_timeout,
check_interval=CONF.benchmark.heat_stack_create_poll_interval)

27
tests/unit/benchmark/scenarios/heat/test_utils.py
View File

@ -17,6 +17,7 @@ import mock
from oslotest import mockpatch
from rally.benchmark.scenarios.heat import utils
from rally import exceptions
from tests.unit import test
BM_UTILS = 'rally.benchmark.utils'
@ -90,3 +91,29 @@ class HeatScenarioTestCase(test.TestCase):
stack = {'stack_status': 'CREATE_COMPLETED'}
status_fn = utils.heat_resource_is('CREATE_COMPLETED')
status_fn(stack)
class HeatScenarioNegativeTestCase(test.TestCase):
@mock.patch(HEAT_UTILS + '.HeatScenario.clients')
@mock.patch(HEAT_UTILS + '.CONF.benchmark')
def test_failed_create_stack(self, mock_bench, mock_clients):
mock_bench.heat_stack_create_prepoll_delay = 2
mock_bench.heat_stack_create_timeout = 1
mock_bench.benchmark.heat_stack_create_poll_interval = 1
mock_clients("heat").stacks.create.return_value = {
'stack': {'id': 'test_id'}
}
stack = mock.Mock()
resource = mock.Mock()
resource.stack_status = "CREATE_FAILED"
stack.manager.get.return_value = resource
mock_clients("heat").stacks.get.return_value = stack
scenario = utils.HeatScenario()
try:
ex = self.assertRaises(exceptions.GetResourceErrorStatus,
scenario._create_stack, 'stack_name')
self.assertIn('has CREATE_FAILED status', str(ex))
except exceptions.TimeoutException:
raise self.fail('Unrecognized error status')