Convert remainging unit tests ...

and reduce nose dependency.

Author: rocky

Makefile

@@ -9,18 +9,14 @@ PYTHON ?= python3
 RM      ?= rm
 LINT    =o flake8
 
-#EXTRA_DIST=ipython/ipy_pydbgr.py pydbgr
 PHONY=check clean dist distclean test test-unit test-functional rmChangeLog nosetests flake8
 
 #: Default target - same as "check"
-all: check
+all: test-unit
 
 #: Same as "check"
 test: check
 
-#: Run all tests: unit, functional and integration
-check-short: test-unit-short test-functional-short test-integration-short
-
 # Check StructuredText long description formatting
 check-rst:
 	$(PYTHON) setup.py --long-description | ./rst2html.py > python3-trepan.html
@@ -31,16 +27,11 @@ flake8:
 
 #: Run all tests: unit, functional and integration verbosely
 # check: test-unit test-functional test-integration # flake8
-check: test-unit test-integration # flake8
+check: test-unit
 
 #: Run unit (transparent-box) tests
 test-unit:
-	$(PYTHON) -m pytest test/unit/lib test/unit/processor test/unit/test_*.py
-
-#: Run unit (white-box) tests
-test-unit-short:
-	$(PYTHON) ./setup.py nosetests --quiet | \
-	$(PYTHON) ./make-check-filter.py
+	$(PYTHON) -m pytest test/unit
 
 #: Run functional tests
 test-functional:

test/make-check-filter.py

@@ -0,0 +1,20 @@
+"""Unit test for trepan.inout.input"""
+import os.path as osp
+
+from trepan.inout.input import DebuggerUserInput
+
+srcdir = osp.abspath(osp.dirname(__file__))
+
+
+def test_DebuggerInput():
+    cmdhelper_file = osp.join(srcdir, "..", "cmdhelper.py")
+    inp = DebuggerUserInput(cmdhelper_file)
+    assert isinstance(
+        inp, DebuggerUserInput
+    ), "Should have gotten a DebuggerUserInput object back"
+    line = inp.readline()
+    assert "# -*- coding: utf-8 -*-" == line
+    inp.close()
+    # Should be okay
+    inp.close()
+    return

test/unit/inout/__init__.py

@@ -0,0 +1,87 @@
+"""Unit test for trepan.processor.subcmd"""
+import unittest
+
+from trepan.processor.command.base_cmd import DebuggerCommand
+from trepan.processor.command.mock import MockDebugger
+from trepan.processor.subcmd import Subcmd
+
+
+class MyCommand(DebuggerCommand):
+    """Trepan processor Debugger Command base"""
+
+    category = "data"
+    min_args = 0
+    max_args = 5
+    name_aliases = "mycommand"
+
+    def __init__(self):
+        self.name = "test"
+        return
+
+    def run(self, args):
+        print("test command run")
+
+    pass
+
+
+class MySubcommand:
+    """Doc string for test testing subcommand"""
+
+    def __init__(self):
+        self.name = "testing"
+        return
+
+    short_help = "This is short help for test testing"
+    min_abbrev = 4
+    in_list = True
+
+    def run(self, args):
+        print("test testing run")
+
+    pass
+
+
+class TestSubcommand(unittest.TestCase):
+    def setUp(self):
+        self.d = MockDebugger()
+        self.mycmd = MyCommand()
+        self.mycmd.debugger = self.d
+        self.mycmd.proc = self.d.core.processor
+        self.mycmdMgr = Subcmd("me", self.mycmd)
+        self.testsub = MySubcommand()
+        self.mycmdMgr.add(self.testsub)
+
+    def test_lookup(self):
+        """Test processor.subcmd.lookup()"""
+        for prefix, expected in (
+            ("tes", "None"),  # Too few chars
+            ("test", "testing"),  # A valid abbrev
+            ("testing", "testing"),  # equal name
+            ("testing1", "None"),
+        ):  # Too long
+            x = self.mycmdMgr.lookup(prefix)
+            if x:
+                s = x.name
+            else:
+                s = "None"
+            self.assertEqual(
+                expected,
+                s,
+                ("prefix %s, expected: %s result: %s" % (prefix, expected, s)),
+            )
+            pass
+        return
+
+    def test_list(self):
+        """Test processor.subcmd.list()"""
+        self.assertEqual(["testing"], self.mycmdMgr.list())
+        testsub2 = MySubcommand()
+        testsub2.name = "foobar"
+        self.mycmdMgr.add(testsub2)
+        self.assertEqual(["foobar", "testing"], self.mycmdMgr.list())
+
+    pass
+
+
+if __name__ == "__main__":
+    unittest.main()

test/unit/inout/test_inout_input.py

@@ -1,17 +1,18 @@
 # -*- coding: utf-8 -*-
-#   Copyright (C) 2015, 2017-2018, 2020 Rocky Bernstein
+#   Copyright (C) 2015, 2017-2018, 2020, 2024 Rocky Bernstein
 #
 
 from pygments.styles import STYLE_MAP
 
 style_names = sorted(list(STYLE_MAP.keys()))
 
-# Our local modules
-from trepan.processor.command import base_subcmd as Mbase_subcmd
 from trepan.lib import complete as Mcomplete
 
+# Our local modules
+from trepan.processor.command.base_subcmd import DebuggerSubcommand
+
 
-class SetStyle(Mbase_subcmd.DebuggerSubcommand):
+class SetStyle(DebuggerSubcommand):
     """**set style** [*pygments-style*]
 
     Set the pygments style in to use in formatting text for a 256-color terminal.