diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-12 00:59:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-12 00:59:06 +0000 |
| commit | d240091c32c033b25c2a805b1fd66468429c221c (patch) | |
| tree | edc35b90d18f1e5a0f54241f93323b1f7aeea35f | |
| parent | 7f282a5ea46cb46a306d16cc352c3beddf7c129e (diff) | |
| parent | e2436b310f294992857f22a6d52ede03e36b99b1 (diff) | |
| download | python-cinderclient-d240091c32c033b25c2a805b1fd66468429c221c.tar.gz | |
Merge "Update hacking version"
| -rw-r--r-- | cinderclient/tests/unit/v3/test_shell.py | 4 | ||||
| -rw-r--r-- | cinderclient/v3/shell.py | 1 | ||||
| -rw-r--r-- | doc/source/user/shell.rst | 2 | ||||
| -rw-r--r-- | test-requirements.txt | 3 |
4 files changed, 6 insertions, 4 deletions
diff --git a/cinderclient/tests/unit/v3/test_shell.py b/cinderclient/tests/unit/v3/test_shell.py index ee35ddf..bcf1e3d 100644 --- a/cinderclient/tests/unit/v3/test_shell.py +++ b/cinderclient/tests/unit/v3/test_shell.py @@ -1068,8 +1068,8 @@ class ShellTest(utils.TestCase): def test_group_failover_replication(self, attach_vol, backend): attach = '--allow-attached-volume ' if attach_vol else '' backend_id = ('--secondary-backend-id ' + backend) if backend else '' - cmd = ('--os-volume-api-version 3.38 group-failover-replication 1234 ' - + attach + backend_id) + cmd = ('--os-volume-api-version 3.38 ' + 'group-failover-replication 1234 ' + attach + backend_id) self.run_command(cmd) expected = {'failover_replication': {'allow_attached_volume': attach_vol, diff --git a/cinderclient/v3/shell.py b/cinderclient/v3/shell.py index fa1cc9c..85feca5 100644 --- a/cinderclient/v3/shell.py +++ b/cinderclient/v3/shell.py @@ -31,6 +31,7 @@ from cinderclient import shell_utils from cinderclient import utils from cinderclient.v2.shell import * # noqa +from cinderclient.v2.shell import CheckSizeArgForCreate FILTER_DEPRECATED = ("This option is deprecated and will be removed in " "newer release. Please use '--filters' option which " diff --git a/doc/source/user/shell.rst b/doc/source/user/shell.rst index a06fbff..7d478cf 100644 --- a/doc/source/user/shell.rst +++ b/doc/source/user/shell.rst @@ -1,5 +1,5 @@ The :program:`cinder` shell utility -========================================= +=================================== .. program:: cinder .. highlight:: bash diff --git a/test-requirements.txt b/test-requirements.txt index a62a308..662a346 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,7 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 + +hacking>=1.1.0,<1.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT fixtures>=3.0.0 # Apache-2.0/BSD |