Start removing "nose" from functional tests

rocky · rocky · commit 1db47a576275 · 2024-02-04T08:54:52.000-05:00
diff --git a/__pkginfo__.py b/__pkginfo__.py
@@ -46,7 +46,9 @@
 # 3.4            | pip      | 19.1.1       |
 
 # Things that change more often go here.
-copyright = """Copyright (C) 2013, 2015-2021, 2023 Rocky Bernstein <rocky@gnu.org>."""
+copyright = (
+    """Copyright (C) 2013, 2015-2021, 2023-2024 Rocky Bernstein <rocky@gnu.org>."""
+)
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Console",
@@ -65,6 +67,8 @@
     "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
 
diff --git a/setup.cfg b/setup.cfg
@@ -1,18 +1,3 @@
-[nosetests]
-# If "where is a directory, then that's the working directory.
-tests=./test/unit
-
-# Our tests are also executable since they are allowed to be run
-# individually. By default nose excludes these.
-exe=on
-
-# Show individual tests run
-verbosity = 2
-
-# debug=nose.loader
-# pdb=on
-detailed-errors = on
-
 [upload]
 show_response = 1
 
diff --git a/setup.py b/setup.py
@@ -4,8 +4,8 @@
 from setuptools import find_packages, setup
 
 SYS_VERSION = sys.version_info[0:2]
-if not ((3, 1) <= SYS_VERSION <= (3, 12)):
-    mess = "Python Versions 3.1 to 3.11 are supported only in this package."
+if not ((3, 1) <= SYS_VERSION < (3, 13)):
+    mess = "Python Versions 3.1 to 3.12 are supported only in this package."
     if (2, 4) <= SYS_VERSION <= (2, 7):
         mess += "\nFor your Python, version %s, See trepan2" % sys.version[0:3]
     elif SYS_VERSION < (2, 4):
diff --git a/test/functional/Makefile b/test/functional/Makefile
@@ -4,25 +4,12 @@ PHONY=all check check-short test-functional test-functional-short
 
 #: Same as test-functional
 all, test, check:
-	$(MAKE) test-functional
+	$(PYTHON) -m pytest .
 
 #: Same as test-functional-short
 check-short:
 	$(MAKE) test-functional-short
 
-#: Run functional tests
-test-functional:
-	$(PYTHON) ./setup.py nosetests
-
-#: Run functional tests reduced verbosity
-test-functional-short:
-	$(PYTHON) ./setup.py nosetests | \
-	$(PYTHON) ../../make-check-filter.py
-
-#: Remove derived files
-clean:
-	-rm -fr *.egg-info || true
-
 # Whatever else it is you want to do, it should be forwarded to the
 # to top-level directories
 %:
diff --git a/test/functional/__init__.py b/test/functional/__init__.py
diff --git a/test/functional/example/jump.py b/test/functional/example/jump.py
@@ -0,0 +1,13 @@
+# This code fragment what is embedded inside ../test_jump.py
+# We have it here to make it easy to test things when things go wrong.
+
+
+# commands are:
+#   step
+#   jump 13 # 6 + 7
+#   continue
+##############################  # 3...
+x = 4
+x = 5
+x = 6
+z = 7  # NOQA
diff --git a/test/functional/fn_helper.py b/test/functional/fn_helper.py
@@ -1,44 +1,45 @@
+"""
+Helper module for functional testing.
+"""
+import re
 import sys
 
-import trepan.inout.stringarray
-from trepan import debugger as Mdebugger
-from trepan.inout import stringarray as Mstringarray
+from trepan.debugger import Trepan
+from trepan.inout.stringarray import StringArrayInput, StringArrayOutput
 
 
 def strarray_setup(debugger_cmds):
-    ''' Common setup to create a debugger with stringio attached '''
-    stringin                = Mstringarray.StringArrayInput(debugger_cmds)
-    stringout               = Mstringarray.StringArrayOutput()
-    d_opts                  = {'input' : stringin,
-                               'output': stringout}
-    d                       = Mdebugger.Trepan(d_opts)
-    d.settings['basename']  = True
-    d.settings['different'] = False
-    d.settings['autoeval']  = False
-    d.settings['highlight'] = 'plain'
+    """Common setup to create a debugger with stringio attached"""
+    stringin = StringArrayInput(debugger_cmds)
+    stringout = StringArrayOutput()
+    d_opts = {"input": stringin, "output": stringout}
+    d = Trepan(d_opts)
+    d.settings["basename"] = True
+    d.settings["different"] = False
+    d.settings["autoeval"] = False
+    d.settings["highlight"] = "plain"
     return d
 
-import re
-trepan_prompt = re.compile(r'^.. \d+.*\n\(trepan3k(:.+)?\) ')
-trepan_loc    = re.compile(r'^\(.+:\d+\): ')
+
+trepan_prompt = re.compile(r"^.. \d+.*\n\(trepan3k(:.+)?\) ")
+trepan_loc = re.compile(r"^\(.+:\d+\): ")
 
 
 def filter_line_cmd(a):
-    '''Return output with source lines prompt and command removed'''
+    """Return output with source lines prompt and command removed"""
     # Remove extra leading spaces.
     # For example:
     # -- 42         y = 5
     # becomes
     # -- y = 5
-    a1 = [re.sub(r'^(..) \d+\s+', r'\1 ', s) for s in a
-         if re.match(r'^.. \d+\s+', s)]
+    a1 = [re.sub(r"^(..) \d+\s+", r"\1 ", s) for s in a if re.match(r"^.. \d+\s+", s)]
     # Remove debugger prompts
     # For example:
     #  (trepan3k)
-    a2 = [re.sub(r'\n\(trepan3k\) .*', '', s) for s in a1]
+    a2 = [re.sub(r"\n\(trepan3k\) .*", "", s) for s in a1]
 
     # Remove locations (test-next.py:41): test_next_between_fn
-    a3 = [re.sub(r'\n\(.*:\d+\):.*', '', s) for s in a2]
+    a3 = [re.sub(r"\n\(.*:\d+\):.*", "", s) for s in a2]
     return a3
 
 
@@ -48,7 +49,7 @@ def get_lineno():
     return caller.f_lineno
 
 
-def compare_output(obj, right, d, debugger_cmds):
+def compare_output(obj, right, d):
     got = filter_line_cmd(d.intf[-1].output.output)
     if got != right:
         for i in range(len(got)):
@@ -58,7 +59,7 @@ def compare_output(obj, right, d, debugger_cmds):
                 print("  ", got[i])
                 pass
             pass
-        print('-' * 10)
+        print("-" * 10)
         for i in range(len(right)):
             if i < len(got) and got[i] != right[i]:
                 print("! ", right[i])
@@ -70,7 +71,8 @@ def compare_output(obj, right, d, debugger_cmds):
     obj.assertEqual(right, got)
     return
 
+
 # Demo it
-if __name__=='__main__':
+if __name__ == "__main__":
     print(get_lineno())
     pass
diff --git a/test/functional/setup.cfg b/test/functional/setup.cfg
diff --git a/test/functional/setup.py b/test/functional/setup.py
diff --git a/test/functional/test-jump.py b/test/functional/test-jump.py
diff --git a/test/functional/test_finish.py b/test/functional/test_finish.py
@@ -1,14 +1,16 @@
-#!/usr/bin/env python3
+"""
+Functional test of debugger "finish" command.
+"""
 import unittest
-from fn_helper import compare_output, strarray_setup
+from test.functional.fn_helper import compare_output, strarray_setup
 
 
 class TestFinish(unittest.TestCase):
     def test_finish_same_level(self):
         print("test ", __file__, "finish_same_level skipped")
         return
 
-        cmds = ['step 5', 'finish', 'continue']
+        cmds = ["step 5", "finish", "continue"]
         d = strarray_setup(cmds)
         d.core.start()
 
@@ -20,13 +22,15 @@ def foo():
             bar()
             x = 2  # NOQA
             return 5
+
         foo()
         d.core.stop()
-        out = ['-- def foo():',
-               '-- x = 3',
-               '<- return 1',
-               '<- return 5',  # FIXME this isn't right
-               ]
+        out = [
+            "-- def foo():",
+            "-- x = 3",
+            "<- return 1",
+            "<- return 5",  # FIXME this isn't right
+        ]
         compare_output(self, out, d, cmds)
 
     # def test_finish_with_up(self):
@@ -52,5 +56,6 @@ def foo():
 
     pass
 
-if __name__ == '__main__':
+
+if __name__ == "__main__":
     unittest.main()
diff --git a/test/functional/test_jump.py b/test/functional/test_jump.py
@@ -0,0 +1,40 @@
+"""
+Functional test of debugger "jump" command.
+"""
+import inspect
+import os
+import unittest
+from test.functional.fn_helper import compare_output, strarray_setup
+
+
+class TestJump(unittest.TestCase):
+    @unittest.skipIf(
+        "TRAVIS" in os.environ, "FIXME: figure out why this doesn't work in travis"
+    )
+    def test_skip(self):
+        # See that we can jump with line number
+        curframe = inspect.currentframe()
+        cmds = ["step", "jump %d" % (curframe.f_lineno + 7), "continue"]
+        d = strarray_setup(cmds)  # 1
+        d.core.start()  # 2
+        ##############################          # 3...
+        x = 4
+        x = 5
+        x = 6
+        z = 7  # NOQA
+        ##############################
+        d.core.stop(options={"remove": True})
+        out = [
+            "-- x = 4\n",  # x = 4 is shown in prompt, but not run.
+            "-- x = 5",
+            "-- z = 7  # NOQA",
+        ]
+        compare_output(self, out, d)
+        self.assertEqual(4, x)  # Make sure x = 5 and 6 were skipped.
+        return
+
+    pass
+
+
+if __name__ == "__main__":
+    unittest.main()
diff --git a/trepan/debugger.py b/trepan/debugger.py
@@ -17,13 +17,13 @@
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Debugger class and top-level debugger functions.
 
-This module contains the `Debugger' class and some top-level routines
+This module contains the ``Trepan`` class and some top-level routines
 for creating and invoking a debugger. Most of this module serves as:
   * a wrapper for `Debugger.core' routines,
-  * a place to define `Debugger' exceptions, and
-  * `Debugger' settings.
+  * a place to define debugger exceptions, and
+  * debugger settings.
 
-See also module `cli' which contains a command-line interface to debug
+See also module ``cli`` which contains a command-line interface to debug
 a Python script and `core' which contains the core debugging
 start/stop and event-handling dispatcher and `client.py' which is a
 user or client-side code for connecting to server'd debugged program.
@@ -39,13 +39,13 @@
 # External Egg packages
 import tracer
 
+from trepan.exception import DebuggerQuit, DebuggerRestart
 from trepan.interfaces.user import UserInterface
+from trepan.lib.core import TrepanCore
 
 # Default settings used here
 from trepan.lib.default import DEBUGGER_SETTINGS, START_OPTS
 from trepan.lib.sighandler import SignalManager
-from trepan.exception import DebuggerQuit, DebuggerRestart
-from trepan.lib.core import TrepanCore
 from trepan.misc import option_set
 
 try:
@@ -61,6 +61,13 @@ def get_line_buffer():
 
 
 class Trepan:
+    """
+    Class for a top-level object.
+    """
+
+    def __init__(self):
+        self.settings = {}
+
     # The following functions have to be defined before
     # DEFAULT_INIT_OPTS which includes references to these.
 
@@ -369,6 +376,7 @@ def complete(self, last_token: str, state: int):
             results = self.core.processor.completer(string_seen, state)
             return results[state]
         return
+
     pass
 
 
