From e097f656c378d7ef066c2524050997bcd89c7ef7 Mon Sep 17 00:00:00 2001 From: Foo Date: Sun, 10 May 2015 22:23:19 +0300 Subject: [PATCH 1/2] Fix main arguments parser tests --- tests/test_cmdline.py | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/tests/test_cmdline.py b/tests/test_cmdline.py index af3562a3..ddabab2b 100644 --- a/tests/test_cmdline.py +++ b/tests/test_cmdline.py @@ -61,8 +61,8 @@ class TestParser(TestCase): err = StrIO() with replace_attr(sys, 'stdout', out, 'stderr', err): for argv, expargs in [ - (['shell'], {'ext': ['shell']}), - (['shell', '-r', '.zsh'], {'ext': ['shell'], 'renderer_module': '.zsh'}), + (['shell', 'left'], {'ext': ['shell'], 'side': 'left'}), + (['shell', 'left', '-r', '.zsh'], {'ext': ['shell'], 'renderer_module': '.zsh', 'side': 'left'}), ([ 'shell', 'left', @@ -98,11 +98,20 @@ class TestParser(TestCase): 'config_path': ['.', '..'], 'renderer_arg': {'smth': {'abc': 'def'}}, }), - (['shell', '-R', 'arg=true'], {'ext': ['shell'], 'renderer_arg': {'arg': True}}), - (['shell', '-R', 'arg=true', '-R', 'arg='], {'ext': ['shell'], 'renderer_arg': {}}), - (['shell', '-R', 'arg='], {'ext': ['shell'], 'renderer_arg': {}}), - (['shell', '-t', 'default.segment_info={"hostname": {}}'], { + (['shell', 'left', '-R', 'arg=true'], { 'ext': ['shell'], + 'side': 'left', + 'renderer_arg': {'arg': True}, + }), + (['shell', 'left', '-R', 'arg=true', '-R', 'arg='], { + 'ext': ['shell'], + 'side': 'left', + 'renderer_arg': {}, + }), + (['shell', 'left', '-R', 'arg='], {'ext': ['shell'], 'renderer_arg': {}, 'side': 'left'}), + (['shell', 'left', '-t', 'default.segment_info={"hostname": {}}'], { + 'ext': ['shell'], + 'side': 'left', 'theme_override': { 'default': { 'segment_info': { @@ -111,7 +120,11 @@ class TestParser(TestCase): } }, }), - (['shell', '-c', 'common={ }'], {'ext': ['shell'], 'config_override': {'common': {}}}), + (['shell', 'left', '-c', 'common={ }'], { + 'ext': ['shell'], + 'side': 'left', + 'config_override': {'common': {}}, + }), ]: args = parser.parse_args(argv) finish_args({}, args) From 7b6986022ef4dfdd7d3cb11c6e140f1de49d45f7 Mon Sep 17 00:00:00 2001 From: Foo Date: Sun, 10 May 2015 22:31:06 +0300 Subject: [PATCH 2/2] Update base version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 09aa952b..686f19f1 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ else: def get_version(): - base_version = '2.1.2' + base_version = '2.1.3' base_version += '.dev9999' try: return base_version + '+git.' + str(subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip())