openstack/swift
Code Issues Proposed changes

s-m-s-r: use argparse mutually exclusive group

Browse Source 
Change-Id: I36e9cb777219162105912ea32945153f5808507f
This commit is contained in:
Clay Gerrard 2021-05-13 13:42:46 -05:00 committed by Alistair Coles
parent 9edcfad22f
commit bbe189b537
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift/cli/manage_shard_ranges.py
View File

@ -728,11 +728,12 @@ def _add_enable_args(parser):
def _add_prompt_args(parser): def _add_prompt_args(parser):
parser.add_argument( group = parser.add_mutually_exclusive_group()
group.add_argument(
'--yes', '-y', action='store_true', default=False, '--yes', '-y', action='store_true', default=False,
help='Apply shard range changes to broker without prompting. ' help='Apply shard range changes to broker without prompting. '
'Cannot be used with --dry-run option.') 'Cannot be used with --dry-run option.')
parser.add_argument( group.add_argument(
'--dry-run', '-n', action='store_true', default=False, '--dry-run', '-n', action='store_true', default=False,
help='Do not apply any shard range changes to broker. ' help='Do not apply any shard range changes to broker. '
'Cannot be used with --yes option.') 'Cannot be used with --yes option.')
@ -890,10 +891,6 @@ def main(args=None):
print('\nA sub-command is required.', file=sys.stderr) print('\nA sub-command is required.', file=sys.stderr)
return EXIT_INVALID_ARGS return EXIT_INVALID_ARGS
if getattr(args, 'yes', False) and getattr(args, 'dry_run', False):
print('--yes and --dry-run cannot both be set.', file=sys.stderr)
return EXIT_INVALID_ARGS
conf = {} conf = {}
rows_per_shard = DEFAULT_ROWS_PER_SHARD rows_per_shard = DEFAULT_ROWS_PER_SHARD
shrink_threshold = DEFAULT_SHRINK_THRESHOLD shrink_threshold = DEFAULT_SHRINK_THRESHOLD

16
test/unit/cli/test_manage_shard_ranges.py
View File

@ -12,6 +12,7 @@
import json import json
import os import os
import sys
import unittest import unittest
from argparse import Namespace from argparse import Namespace
from textwrap import dedent from textwrap import dedent
@ -1776,8 +1777,15 @@ class TestManageShardRanges(unittest.TestCase):
out = StringIO() out = StringIO()
err = StringIO() err = StringIO()
with mock.patch('sys.stdout', out), \ with mock.patch('sys.stdout', out), \
mock.patch('sys.stderr', err): mock.patch('sys.stderr', err), \
ret = main(['db file', 'repair', '--dry-run', '--yes']) self.assertRaises(SystemExit) as cm:
self.assertEqual(2, ret) main(['db file', 'repair', '--dry-run', '--yes'])
self.assertEqual(2, cm.exception.code)
err_lines = err.getvalue().split('\n') err_lines = err.getvalue().split('\n')
self.assertIn('--yes and --dry-run cannot both be set.', err_lines) runner = os.path.basename(sys.argv[0])
self.assertEqual(
'usage: %s path_to_file repair [-h] [--yes | --dry-run]' % runner,
err_lines[0])
self.assertIn(
"argument --yes/-y: not allowed with argument --dry-run/-n",
err_lines[1])