add --pop-leader to remove a value in a leader option
This commit is contained in:
@ -7,7 +7,7 @@ from argparse import RawDescriptionHelpFormatter
|
||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||
SymLinkOption, OptionDescription, Config
|
||||
from tiramisu_json_api import Config as JsonConfig
|
||||
from tiramisu_api import Config as JsonConfig
|
||||
|
||||
|
||||
|
||||
|
@ -6,7 +6,7 @@ import pytest
|
||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||
SymLinkOption, OptionDescription, Leadership, Config, submulti
|
||||
from tiramisu_json_api import Config as JsonConfig
|
||||
from tiramisu_api import Config as JsonConfig
|
||||
|
||||
|
||||
def get_config(json, with_mandatory=False):
|
||||
@ -23,7 +23,7 @@ def get_config(json, with_mandatory=False):
|
||||
opt_list = [leader, follower, follower_submulti, follower_integer, follower_boolean, follower_choice]
|
||||
if with_mandatory:
|
||||
opt_list.append(StrOption('follower_mandatory', "Follower mandatory", multi=True, properties=('mandatory',)))
|
||||
leadership = Leadership('leader', '', opt_list)
|
||||
leadership = Leadership('leader', 'leader', opt_list)
|
||||
config = Config(OptionDescription('root', 'root', [leadership]))
|
||||
if json == 'tiramisu':
|
||||
return config
|
||||
@ -38,6 +38,7 @@ def json(request):
|
||||
|
||||
def test_leadership_help(json):
|
||||
output = """usage: prog.py [-h] [--leader.leader [LEADER [LEADER ...]]]
|
||||
[--leader.pop-leader INDEX]
|
||||
[--leader.follower INDEX [FOLLOWER]] --leader.follower_submulti
|
||||
INDEX [FOLLOWER_SUBMULTI ...]
|
||||
[--leader.follower_integer INDEX [FOLLOWER_INTEGER]]
|
||||
@ -54,6 +55,7 @@ leader:
|
||||
|
||||
--leader.leader [LEADER [LEADER ...]]
|
||||
Leader var
|
||||
--leader.pop-leader INDEX
|
||||
--leader.follower INDEX [FOLLOWER]
|
||||
Follower
|
||||
--leader.follower_submulti INDEX [FOLLOWER_SUBMULTI ...]
|
||||
@ -105,6 +107,7 @@ def test_leadership_modif_follower(json):
|
||||
|
||||
def test_leadership_modif_follower_not_submulti(json):
|
||||
output = """usage: prog.py [-h] [--leader.leader [LEADER [LEADER ...]]]
|
||||
[--leader.pop-leader INDEX]
|
||||
[--leader.follower INDEX [FOLLOWER]]
|
||||
[--leader.follower_submulti INDEX [FOLLOWER_SUBMULTI ...]]
|
||||
[--leader.follower_integer INDEX [FOLLOWER_INTEGER]]
|
||||
@ -199,6 +202,7 @@ def test_leadership_modif_follower_choice(json):
|
||||
|
||||
def test_leadership_modif_follower_choice_unknown(json):
|
||||
output = """usage: prog.py [-h] [--leader.leader [LEADER [LEADER ...]]]
|
||||
[--leader.pop-leader INDEX]
|
||||
[--leader.follower INDEX [FOLLOWER]]
|
||||
[--leader.follower_submulti INDEX [FOLLOWER_SUBMULTI ...]]
|
||||
[--leader.follower_integer INDEX [FOLLOWER_INTEGER]]
|
||||
@ -222,6 +226,7 @@ prog.py: error: invalid choice: 'opt_unknown' (choose from 'opt1', 'opt2')
|
||||
|
||||
def test_leadership_modif_follower_not_number(json):
|
||||
output = """usage: prog.py [-h] [--leader.leader [LEADER [LEADER ...]]]
|
||||
[--leader.pop-leader INDEX]
|
||||
[--leader.follower INDEX [FOLLOWER]]
|
||||
[--leader.follower_submulti INDEX [FOLLOWER_SUBMULTI ...]]
|
||||
[--leader.follower_integer INDEX [FOLLOWER_INTEGER]]
|
||||
@ -260,6 +265,23 @@ def test_leadership_modif_multi(json):
|
||||
assert config.value.dict() == output
|
||||
|
||||
|
||||
def test_leadership_modif_multi_reduce(json):
|
||||
output = {'leader.leader': ['192.168.1.1', '192.168.253.1'],
|
||||
'leader.follower': ['255.255.255.128', '255.255.255.0'],
|
||||
'leader.follower_boolean': [None, None],
|
||||
'leader.follower_choice': [None, None],
|
||||
'leader.follower_integer': [None, None],
|
||||
'leader.follower_submulti': [[], []]}
|
||||
|
||||
config = get_config(json)
|
||||
parser = TiramisuCmdlineParser(config, 'prog.py')
|
||||
parser.parse_args(['--leader.leader', '192.168.1.1', '10.253.10.1', '192.168.253.1',
|
||||
'--leader.follower', '0', '255.255.255.128',
|
||||
'--leader.follower', '2', '255.255.255.0',
|
||||
'--leader.pop-leader', '1'])
|
||||
assert config.value.dict() == output
|
||||
|
||||
|
||||
def test_leadership_modif_mandatory(json):
|
||||
output = {'leader.leader': ['192.168.1.1'],
|
||||
'leader.follower': [None],
|
||||
@ -269,6 +291,7 @@ def test_leadership_modif_mandatory(json):
|
||||
'leader.follower_integer': [None],
|
||||
'leader.follower_submulti': [['255.255.255.128']]}
|
||||
output2 = """usage: prog.py --leader.leader ['192.168.1.1'] [-h]
|
||||
[--leader.pop-leader INDEX]
|
||||
[--leader.follower INDEX [FOLLOWER]]
|
||||
--leader.follower_submulti
|
||||
INDEX [FOLLOWER_SUBMULTI ...]
|
||||
|
@ -6,7 +6,7 @@ import pytest
|
||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||
SymLinkOption, OptionDescription, Config
|
||||
from tiramisu_json_api import Config as JsonConfig
|
||||
from tiramisu_api import Config as JsonConfig
|
||||
|
||||
|
||||
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
|
||||
@ -80,8 +80,6 @@ od1.od0:
|
||||
-nv, --od1.od0.no-verbosity
|
||||
|
||||
od2:
|
||||
od2
|
||||
|
||||
--od2.before BEFORE Before
|
||||
--od2.after AFTER After
|
||||
|
||||
@ -115,8 +113,6 @@ od1.od0:
|
||||
-nv, --od1.od0.no-verbosity
|
||||
|
||||
od2:
|
||||
od2
|
||||
|
||||
--od2.before BEFORE Before
|
||||
--od2.after AFTER After
|
||||
|
||||
|
@ -6,7 +6,7 @@ import pytest
|
||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||
SymLinkOption, OptionDescription, Config
|
||||
from tiramisu_json_api import Config as JsonConfig
|
||||
from tiramisu_api import Config as JsonConfig
|
||||
|
||||
|
||||
def get_config(json, has_tree=False, default_verbosity=False, add_long=False, add_store_false=False):
|
||||
|
@ -6,7 +6,7 @@ from contextlib import redirect_stderr
|
||||
from tiramisu_cmdline_parser import TiramisuCmdlineParser
|
||||
from tiramisu import IntOption, StrOption, BoolOption, ChoiceOption, \
|
||||
SymLinkOption, OptionDescription, Config
|
||||
from tiramisu_json_api import Config as JsonConfig
|
||||
from tiramisu_api import Config as JsonConfig
|
||||
|
||||
|
||||
@pytest.fixture(params=['tiramisu', 'tiramisu-json'])
|
||||
|
Reference in New Issue
Block a user