From b11d5d468cec658e041677fb3d2f615d880d1297 Mon Sep 17 00:00:00 2001 From: Derek Bekoe Date: Mon, 30 Jan 2017 11:45:33 -0800 Subject: [PATCH] =?UTF-8?q?No=20=E2=80=98null=E2=80=99=20output=20if=20com?= =?UTF-8?q?mand=20doesn=E2=80=99t=20return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - This prevents commands from printing ‘null’ in JSON output - But still keeps ‘[]’, ‘{}’, and ‘false’ as valid JSON results Closes https://github.com/Azure/azure-cli/issues/1908 --- src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py | 2 +- src/azure-cli/azure/cli/main.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py b/src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py index 0877c7dc7a2..54c42838a35 100644 --- a/src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py +++ b/src/azure-cli-core/azure/cli/core/test_utils/vcr_test_base.py @@ -164,7 +164,7 @@ def __init__(self): pass def compare(self, data): # pylint: disable=no-self-use - none_strings = ['[]', '{}', 'null', 'false'] + none_strings = ['[]', '{}', 'false'] try: assert not data or data in none_strings except AssertionError: diff --git a/src/azure-cli/azure/cli/main.py b/src/azure-cli/azure/cli/main.py index 6186ffad195..047ebd4c6f5 100644 --- a/src/azure-cli/azure/cli/main.py +++ b/src/azure-cli/azure/cli/main.py @@ -38,7 +38,7 @@ def main(args, file=sys.stdout): # pylint: disable=redefined-builtin # Commands can return a dictionary/list of results # If they do, we print the results. - if cmd_result: + if cmd_result and cmd_result.result is not None: from azure.cli.core._output import OutputProducer formatter = OutputProducer.get_formatter(APPLICATION.configuration.output_format) OutputProducer(formatter=formatter, file=file).out(cmd_result)