From 310fca52ed5964cf0bcb33c2656ddd26d0ea2a3f Mon Sep 17 00:00:00 2001 From: Michael Gummelt Date: Fri, 5 Jun 2015 11:10:04 -0700 Subject: [PATCH] improved the dcos package list output when a package lacks an app or command --- cli/dcoscli/tables.py | 4 ++-- cli/tests/fixtures/package.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cli/dcoscli/tables.py b/cli/dcoscli/tables.py index c39b906..d668456 100644 --- a/cli/dcoscli/tables.py +++ b/cli/dcoscli/tables.py @@ -225,9 +225,9 @@ def package_table(packages): fields = OrderedDict([ ('NAME', lambda p: p['name']), - ('APP', lambda p: p['app']['appId'] if 'app' in p else 'null'), + ('APP', lambda p: '\n'.join(p['apps']) if p.get('apps') else '---'), ('COMMAND', - lambda p: p['command']['name'] if 'command' in p else 'null'), + lambda p: p['command']['name'] if 'command' in p else '---'), ('DESCRIPTION', lambda p: p['description']) ]) diff --git a/cli/tests/fixtures/package.py b/cli/tests/fixtures/package.py index 4a734c9..32ac6ce 100644 --- a/cli/tests/fixtures/package.py +++ b/cli/tests/fixtures/package.py @@ -8,9 +8,9 @@ def package_fixture(): """ return { - "app": { - "appId": "/helloworld" - }, + "apps": [ + "/helloworld" + ], "command": { "name": "helloworld" },