openstack/rally-openstack
Code Issues Proposed changes

Merge "Add timeout value into TimeoutException message"

Browse Source
This commit is contained in:
Zuul 2018-01-18 04:56:09 +00:00 committed by Gerrit Code Review
commit 529d37964d
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rally/plugins/openstack/scenarios/magnum/utils.py
View File

@ -216,7 +216,8 @@ class MagnumScenario(scenario.OpenStackScenario):
resource_name=podname,
resource_type="Pod",
resource_id=resp.metadata.uid,
resource_status=resp.status)
resource_status=resp.status,
timeout=CONF.openstack.k8s_pod_create_timeout)
common_utils.interruptable_sleep(
CONF.openstack.k8s_pod_create_poll_interval)
@ -260,6 +261,7 @@ class MagnumScenario(scenario.OpenStackScenario):
resource_name=rcname,
resource_type="ReplicationController",
resource_id=resp.metadata.uid,
resource_status=status)
resource_status=status,
timeout=CONF.openstack.k8s_rc_create_timeout)
common_utils.interruptable_sleep(
CONF.openstack.k8s_rc_create_poll_interval)

3
tests/unit/plugins/openstack/scenarios/vm/test_vmtasks.py
View File

@ -181,7 +181,8 @@ class VMTasksTestCase(test.ScenarioTestCase):
resource_name="foo_name",
resource_id="foo_id",
desired_status="foo_desired_status",
resource_status="foo_resource_status")
resource_status="foo_resource_status",
timeout=2)
exc = self.assertRaises(exceptions.TimeoutException,
scenario.run,
"foo_image", "foo_flavor", "foo_interpreter",