Merged master and resolved conflicts in CHANGELOG

1 files changed, 5 insertions, 2 deletions

diff --git a/tests/test_cmd2.py b/tests/test_cmd2.py
index 91fb8b39..92832e2f 100644
--- a/tests/test_cmd2.py
+++ b/tests/test_cmd2.py
@@ -989,10 +989,13 @@ def test_cmdloop_without_rawinput():
 class HookFailureApp(cmd2.Cmd):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
+        # register a postparsing hook method
+        self.register_postparsing_hook(self.postparsing_precmd)
 
-    def postparsing_precmd(self, statement):
+    def postparsing_precmd(self, data: cmd2.plugin.PostparsingData) -> cmd2.plugin.PostparsingData:
         """Simulate precmd hook failure."""
-        return True, statement
+        data.stop = True
+        return data
 
 @pytest.fixture
 def hook_failure():