Fix unit tests and lint errors

kotfu · kotfu · commit 66046aba3e07 · 2018-07-24T21:14:27.000-06:00
diff --git a/cmd2_myplugin/__init__.py b/cmd2_myplugin/__init__.py
@@ -7,7 +7,7 @@
 
 from pkg_resources import get_distribution, DistributionNotFound
 
-from .myplugin import empty_decorator, MyPlugin
+from .myplugin import empty_decorator, MyPluginMixin
 
 try:
     __version__ = get_distribution(__name__).version
diff --git a/cmd2_myplugin/myplugin.py b/cmd2_myplugin/myplugin.py
@@ -1,7 +1,6 @@
 #
 # coding=utf-8
-
-import sys
+"""An example cmd2 plugin"""
 
 import functools
 from typing import Callable
@@ -18,7 +17,7 @@ def _empty_decorator(self, *args, **kwargs):
     return _empty_decorator
 
 
-class MyPlugin:
+class MyPluginMixin:
     """A mixin class which adds a 'say' command to a cmd2 subclass
 
     The order in which you add the mixin matters. Say you want to
@@ -52,7 +51,10 @@ def cmd2_myplugin_postloop_hook(self) -> None:
         """Method to be called after the command loop finishes"""
         self.poutput("postloop hook")
 
-    def cmd2_myplugin_postparsing_hook(self, data: cmd2.plugin.PostparsingData) -> cmd2.plugin.PostparsingData:
+    def cmd2_myplugin_postparsing_hook(
+            self,
+            data: cmd2.plugin.PostparsingData
+        ) -> cmd2.plugin.PostparsingData:
         """Method to be called after parsing user input, but before running the command"""
-        self.poutput('in postparsing_hook')
+        self.poutput('in postparsing hook')
         return data
diff --git a/tests/test_myplugin.py b/tests/test_myplugin.py
@@ -12,7 +12,7 @@
 #
 ######
 
-class MyApp(cmd2.Cmd, cmd2_myplugin.SayMixin):
+class MyApp(cmd2_myplugin.MyPlugin, cmd2.Cmd):
     """Simple subclass of cmd2.Cmd with our SayMixin plugin included."""
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -46,11 +46,11 @@ def test_say(capsys):
     # call our initialization function instead of using a fixture
     app = init_app()
     # run our mixed in command
-    app.onecmd_plus_hooks('say')
+    app.onecmd_plus_hooks('say hello')
     # use the capsys fixture to retrieve the output on stdout and stderr
     out, err = capsys.readouterr()
     # make our assertions
-    assert out == 'just ran the say command from a plugin\n'
+    assert out == 'in postparsing hook\nhello\n'
     assert not err
 
 def test_decorator(capsys):
@@ -61,5 +61,5 @@ def test_decorator(capsys):
     # use the capsys fixture to retrieve the output on stdout and stderr
     out, err = capsys.readouterr()
     # make our assertions
-    assert out == 'in the empty decorator\nrunning the empty command\n'
+    assert out == 'in postparsing hook\nin the empty decorator\nrunning the empty command\n'
     assert not err
