diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-25 03:06:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-25 03:06:13 +0000 |
| commit | fb7802e591bd51527d58a6c9f35e7cb8f6590a03 (patch) | |
| tree | 7279661a8ee5f1cee35e30374b6eb4c942423802 | |
| parent | 5e6048899aa9cba3ec9b39b944365fb8ac585110 (diff) | |
| parent | 573b6657f0c16fec7a63274bb779c01933c67609 (diff) | |
| download | python-heatclient-1.4.0.tar.gz | |
Merge "Add a nested_depth argument to poll_for_events"1.4.0
| -rw-r--r-- | heatclient/common/event_utils.py | 4 | ||||
| -rw-r--r-- | heatclient/tests/unit/test_event_utils.py | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/heatclient/common/event_utils.py b/heatclient/common/event_utils.py index 18a0b98..6acbbd6 100644 --- a/heatclient/common/event_utils.py +++ b/heatclient/common/event_utils.py @@ -166,7 +166,7 @@ def _get_stack_events(hc, stack_id, event_args): def poll_for_events(hc, stack_name, action=None, poll_period=5, marker=None, - out=None): + out=None, nested_depth=0): """Continuously poll events and logs for performed action on stack.""" if action: @@ -180,7 +180,7 @@ def poll_for_events(hc, stack_name, action=None, poll_period=5, marker=None, if not out: out = sys.stdout while True: - events = get_events(hc, stack_id=stack_name, + events = get_events(hc, stack_id=stack_name, nested_depth=nested_depth, event_args={'sort_dir': 'asc', 'marker': marker}) diff --git a/heatclient/tests/unit/test_event_utils.py b/heatclient/tests/unit/test_event_utils.py index 098d2b5..32e4473 100644 --- a/heatclient/tests/unit/test_event_utils.py +++ b/heatclient/tests/unit/test_event_utils.py @@ -150,10 +150,10 @@ class ShellTestEventUtils(testtools.TestCase): self.assertEqual('CREATE_COMPLETE', stack_status) self.assertEqual('\n Stack astack CREATE_COMPLETE \n', msg) ge.assert_has_calls([ - mock.call(None, stack_id='astack', event_args={ + mock.call(None, stack_id='astack', nested_depth=0, event_args={ 'sort_dir': 'asc', 'marker': None }), - mock.call(None, stack_id='astack', event_args={ + mock.call(None, stack_id='astack', nested_depth=0, event_args={ 'sort_dir': 'asc', 'marker': '4' }) ]) @@ -168,11 +168,12 @@ class ShellTestEventUtils(testtools.TestCase): ]] stack_status, msg = event_utils.poll_for_events( - None, 'astack', action='CREATE', poll_period=0, marker='4') + None, 'astack', action='CREATE', poll_period=0, marker='4', + nested_depth=0) self.assertEqual('CREATE_COMPLETE', stack_status) self.assertEqual('\n Stack astack CREATE_COMPLETE \n', msg) ge.assert_has_calls([ - mock.call(None, stack_id='astack', event_args={ + mock.call(None, stack_id='astack', nested_depth=0, event_args={ 'sort_dir': 'asc', 'marker': '4' }) ]) |