openstack/python-cinderclient
Code Issues Proposed changes

Merge "Fix: --poll inconsistency"

Browse Source
This commit is contained in:
Zuul 2020-02-12 12:56:08 +00:00 committed by Gerrit Code Review
commit 48a9cd5aca
2 changed files with 2 additions and 1 deletions
cinderclient
tests/unit/v3
test_shell.py
v3
shell.py

1
cinderclient/tests/unit/v3/test_shell.py

@ -1165,7 +1165,6 @@ class ShellTest(utils.TestCase):
volume = self.shell.cs.volumes.get('1234') volume = self.shell.cs.volumes.get('1234')
info = dict() info = dict()
info.update(volume._info) info.update(volume._info)
info.pop('links', None)
self.assertEqual(1, poll_method.call_count) self.assertEqual(1, poll_method.call_count)
timeout_period = 3600 timeout_period = 3600
poll_method.assert_has_calls([mock.call(self.shell.cs.volumes.get, poll_method.assert_has_calls([mock.call(self.shell.cs.volumes.get,

2
cinderclient/v3/shell.py

@ -676,6 +676,8 @@ def do_create(cs, args):
shell_utils._poll_for_status( shell_utils._poll_for_status(
cs.volumes.get, volume.id, info, 'creating', ['available'], cs.volumes.get, volume.id, info, 'creating', ['available'],
timeout_period, cs.client.global_request_id, cs.messages) timeout_period, cs.client.global_request_id, cs.messages)
volume = cs.volumes.get(volume.id)
info.update(volume._info)
utils.print_dict(info) utils.print_dict(info)