Skip to content

[minor breaking change] Consolidate exception handling so tests can capture the right exception #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 25, 2018
Merged

[minor breaking change] Consolidate exception handling so tests can capture the right exception #66

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ef3e88
consolidate exception handling
yugangw-msft Jan 3, 2018
4262d84
Address the code review comments
troydai Jan 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions knack/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,8 +157,11 @@ def raise_event(self, event_name, **kwargs):
func(self, **kwargs)

def exception_handler(self, ex): # pylint: disable=no-self-use
""" The default exception handler for unknown CLI exceptions. """
logger.exception(ex)
""" The default exception handler """
if isinstance(ex, CLIError):
logger.error(ex)
else:
logger.exception(ex)
return 1

def invoke(self, args, initial_invocation_data=None, out_file=None):
Expand Down Expand Up @@ -198,9 +201,6 @@ def invoke(self, args, initial_invocation_data=None, out_file=None):
self.output.out(cmd_result, formatter=formatter, out_file=out_file)
self.raise_event(EVENT_CLI_POST_EXECUTE)
exit_code = 0
except CLIError as ex:
logger.error(ex)
exit_code = 1
except KeyboardInterrupt:
exit_code = 1
except Exception as ex: # pylint: disable=broad-except
Expand Down