Browse Source

Refactoring of the cli parseractions module

Condition simplified, new formatting mechanism
introduced in the existing code.

Test coverage for the module included.

Signed-off-by: Jiri Podivin <jpodivin@redhat.com>
Change-Id: I5a7d22a8c58246c937eb1a15314476229dc66566
changes/14/793114/5
Jiri Podivin 6 months ago
committed by Gael Chamoulaud
parent
commit
337288fcc0
  1. 16
      validations_libs/cli/parseractions.py
  2. 8
      validations_libs/tests/cli/fakes.py
  3. 104
      validations_libs/tests/cli/test_parseractions.py

16
validations_libs/cli/parseractions.py

@ -33,13 +33,19 @@ class KeyValueAction(argparse.Action):
setattr(namespace, self.dest, {})
# Add value if an assignment else remove it
if '=' in values and values.count('=') == 1:
if values.count('=') == 1:
values_list = values.split('=', 1)
if '' == values_list[0]:
msg = ("Property key must be specified: %s")
raise argparse.ArgumentTypeError(msg % str(values))
msg = (
"Property key must be specified: {}"
).format(str(values))
raise argparse.ArgumentTypeError(msg)
else:
getattr(namespace, self.dest, {}).update([values_list])
else:
msg = ("Expected 'key=value' type, but got: %s")
raise argparse.ArgumentTypeError(msg % str(values))
msg = (
"Expected 'key=value' type, but got: {}"
).format(str(values))
raise argparse.ArgumentTypeError(msg)

8
validations_libs/tests/cli/fakes.py

@ -40,3 +40,11 @@ class BaseCommand(TestCase):
def setUp(self):
super(BaseCommand, self).setUp()
self.app = app.ValidationCliApp()
KEYVALUEACTION_VALUES = {
'valid': 'foo=bar',
'invalid_noeq': 'foo>bar',
'invalid_multieq': 'foo===bar',
'invalid_nokey': '=bar',
'invalid_multikey': 'foo=bar,fizz=buzz'
}

104
validations_libs/tests/cli/test_parseractions.py

@ -0,0 +1,104 @@
# Copyright 2021 Red Hat, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
#
try:
from unittest import mock
except ImportError:
import mock
from unittest import TestCase
from validations_libs.cli import parseractions
import argparse
from validations_libs.tests.cli.fakes import KEYVALUEACTION_VALUES
class TestParserActions(TestCase):
def setUp(self):
self.action = parseractions.KeyValueAction("", "fizz")
self.mock_parser = mock.MagicMock()
self.test_values = KEYVALUEACTION_VALUES
self.mock_namespace = mock.MagicMock()
self.mock_namespace.fizz = None
super(TestParserActions, self).setUp()
def test_keyvalueaction_valid(self):
self.action(
self.mock_parser,
self.mock_namespace,
self.test_values['valid'])
self.assertIn('fizz', dir(self.mock_namespace))
self.assertDictEqual({'foo': 'bar'}, self.mock_namespace.fizz)
self.tearDown()
def test_keyvalueaction_invalid_no_eq_sign(self):
self.assertRaises(
argparse.ArgumentTypeError,
self.action,
self.mock_parser,
self.mock_namespace,
self.test_values['invalid_noeq']
)
self.assertIn('fizz', dir(self.mock_namespace))
self.assertDictEqual({}, self.mock_namespace.fizz)
self.tearDown()
def test_keyvalueaction_invalid_invalid_multieq(self):
self.assertRaises(
argparse.ArgumentTypeError,
self.action,
self.mock_parser,
self.mock_namespace,
self.test_values['invalid_multieq']
)
self.assertIn('fizz', dir(self.mock_namespace))
self.assertDictEqual({}, self.mock_namespace.fizz)
self.tearDown()
def test_keyvalueaction_invalid_invalid_nokey(self):
self.assertRaises(
argparse.ArgumentTypeError,
self.action,
self.mock_parser,
self.mock_namespace,
self.test_values['invalid_nokey']
)
self.assertIn('fizz', dir(self.mock_namespace))
self.assertDictEqual({}, self.mock_namespace.fizz)
self.tearDown()
def test_keyvalueaction_invalid_invalid_multikey(self):
self.assertRaises(
argparse.ArgumentTypeError,
self.action,
self.mock_parser,
self.mock_namespace,
self.test_values['invalid_multikey']
)
self.assertIn('fizz', dir(self.mock_namespace))
self.assertDictEqual({}, self.mock_namespace.fizz)
self.tearDown()
Loading…
Cancel
Save