From c480f3a2e940757a6698f9270db503ebf4111fd7 Mon Sep 17 00:00:00 2001 From: Kevin Van Brunt Date: Fri, 5 Oct 2018 15:46:35 -0400 Subject: No longer using stderr and self.data together to determine truthiness of a CommandResult. Either self.data is used or if that's not possible, then self.stderr is used. This provided applications the ability to print to stderr even if an error didn't occur. --- tests/test_cmd2.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) (limited to 'tests') diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py index a64f21e4..a2bd6197 100644 --- a/tests/test_cmd2.py +++ b/tests/test_cmd2.py @@ -1576,8 +1576,14 @@ class CommandResultApp(cmd2.Cmd): self._last_result = cmd2.CommandResult(arg, data=True) def do_negative(self, arg): + self._last_result = cmd2.CommandResult(arg, data=False) + + def do_affirmative_no_data(self, arg): self._last_result = cmd2.CommandResult(arg) + def do_negative_no_data(self, arg): + self._last_result = cmd2.CommandResult('', arg) + @pytest.fixture def commandresult_app(): app = CommandResultApp() @@ -1590,11 +1596,19 @@ def test_commandresult_truthy(commandresult_app): assert commandresult_app._last_result assert commandresult_app._last_result == cmd2.CommandResult(arg, data=True) + run_cmd(commandresult_app, 'affirmative_no_data {}'.format(arg)) + assert commandresult_app._last_result + assert commandresult_app._last_result == cmd2.CommandResult(arg) + def test_commandresult_falsy(commandresult_app): arg = 'bar' run_cmd(commandresult_app, 'negative {}'.format(arg)) assert not commandresult_app._last_result - assert commandresult_app._last_result == cmd2.CommandResult(arg) + assert commandresult_app._last_result == cmd2.CommandResult(arg, data=False) + + run_cmd(commandresult_app, 'negative_no_data {}'.format(arg)) + assert not commandresult_app._last_result + assert commandresult_app._last_result == cmd2.CommandResult('', arg) def test_is_text_file_bad_input(base_app): -- cgit v1.2.1