openstack/python-cinderclient
Code Issues Proposed changes

Merge "Update hacking version"

Browse Source
This commit is contained in:
Zuul 2019-12-12 00:59:06 +00:00 committed by Gerrit Code Review
commit d240091c32
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cinderclient/tests/unit/v3/test_shell.py
View File

@ -1068,8 +1068,8 @@ class ShellTest(utils.TestCase):
def test_group_failover_replication(self, attach_vol, backend): def test_group_failover_replication(self, attach_vol, backend):
attach = '--allow-attached-volume ' if attach_vol else '' attach = '--allow-attached-volume ' if attach_vol else ''
backend_id = ('--secondary-backend-id ' + backend) if backend else '' backend_id = ('--secondary-backend-id ' + backend) if backend else ''
cmd = ('--os-volume-api-version 3.38 group-failover-replication 1234 ' cmd = ('--os-volume-api-version 3.38 '
+ attach + backend_id) 'group-failover-replication 1234 ' + attach + backend_id)
self.run_command(cmd) self.run_command(cmd)
expected = {'failover_replication': expected = {'failover_replication':
{'allow_attached_volume': attach_vol, {'allow_attached_volume': attach_vol,

1
cinderclient/v3/shell.py
View File

@ -31,6 +31,7 @@ from cinderclient import shell_utils
from cinderclient import utils from cinderclient import utils
from cinderclient.v2.shell import * # noqa from cinderclient.v2.shell import * # noqa
from cinderclient.v2.shell import CheckSizeArgForCreate
FILTER_DEPRECATED = ("This option is deprecated and will be removed in " FILTER_DEPRECATED = ("This option is deprecated and will be removed in "
"newer release. Please use '--filters' option which " "newer release. Please use '--filters' option which "

2
doc/source/user/shell.rst
View File

@ -1,5 +1,5 @@
The :program:`cinder` shell utility The :program:`cinder` shell utility
========================================= ===================================
.. program:: cinder .. program:: cinder
.. highlight:: bash .. highlight:: bash

3
test-requirements.txt
View File

@ -2,7 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration # of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
# Hacking already pins down pep8, pyflakes and flake8 # 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 coverage!=4.4,>=4.0 # Apache-2.0
ddt>=1.0.1 # MIT ddt>=1.0.1 # MIT
fixtures>=3.0.0 # Apache-2.0/BSD fixtures>=3.0.0 # Apache-2.0/BSD