# HG changeset patch # User Ludovic Chabant # Date 1444801565 25200 # Node ID a65f04ddbea2194e0e3eb5b71e6980ccc0da20e2 # Parent 8073ae8cb16421fdad5e3f31e10eb2ec72732d52 showconfig: Don't crash when the whole config should be shown. diff -r 8073ae8cb164 -r a65f04ddbea2 piecrust/commands/builtin/info.py --- a/piecrust/commands/builtin/info.py Sat Oct 10 23:02:40 2015 -0700 +++ b/piecrust/commands/builtin/info.py Tue Oct 13 22:46:05 2015 -0700 @@ -35,7 +35,11 @@ nargs='?') def run(self, ctx): - show = ctx.app.config.get(ctx.args.path) + if ctx.args.path: + show = ctx.app.config.get(ctx.args.path) + else: + show = ctx.app.config.getAll() + if show is not None: if isinstance(show, (dict, list)): import yaml diff -r 8073ae8cb164 -r a65f04ddbea2 tests/cli/test_showconfig.yaml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/cli/test_showconfig.yaml Tue Oct 13 22:46:05 2015 -0700 @@ -0,0 +1,3 @@ +--- +args: showconfig + diff -r 8073ae8cb164 -r a65f04ddbea2 tests/conftest.py --- a/tests/conftest.py Sat Oct 10 23:02:40 2015 -0700 +++ b/tests/conftest.py Tue Oct 13 22:46:05 2015 -0700 @@ -149,7 +149,7 @@ argv = argv.split(' ') expected_code = self.spec.get('code', 0) - expected_out = self.spec.get('out', '') + expected_out = self.spec.get('out', None) with mock_fs_scope(fs): memstream = io.StringIO() @@ -165,10 +165,11 @@ assert expected_code == exit_code - actual_out = memstream.getvalue() - if self.spec.get('replace_out_path_sep'): - expected_out = expected_out.replace('/', os.sep) - assert expected_out == actual_out + if expected_out is not None: + actual_out = memstream.getvalue() + if self.spec.get('replace_out_path_sep'): + expected_out = expected_out.replace('/', os.sep) + assert expected_out == actual_out def reportinfo(self): return self.fspath, 0, "bake: %s" % self.name