Add skip functional test...

ignore speces in trace output

Author: rocky

test/functional/__init__.py

@@ -0,0 +1,5 @@
+"""
+Functional tests. In contrast to most unit tesets,
+these tests work with a Trepan debugger object and traces or debugs some code with it, testing some particular
+aspect of debugging, such as the ability to step, skip or jump to debugged lines, hit breakpoints, etc.
+"""

test/functional/fn_helper.py

@@ -25,31 +25,36 @@ def strarray_setup(debugger_cmds):
 trepan_loc = re.compile(r"^\(.+:\d+\): ")
 
 
-def filter_line_cmd(a):
+def filter_line_cmd(a: list) -> list:
     """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)]
+
     # Remove debugger prompts
     # For example:
     #  (trepan3k)
     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]
-    return a3
+
+    # Strip leading and trailing blanks.
+    a4 = [s.strip() for s in a3]
+
+    return a4
 
 
-def get_lineno():
+def get_lineno() -> int:
     """Return the caller's line number"""
     caller = sys._getframe(1)
     return caller.f_lineno
 
 
-def compare_output(obj, right, d):
+def compare_output(obj, right: list, d):
     got = filter_line_cmd(d.intf[-1].output.output)
     if got != right:
         for i in range(len(got)):

test/functional/test-skip.py test/functional/test_skip.pytest/functional/test-skip.py renamed to test/functional/test_skip.py

@@ -1,14 +1,11 @@
-#!/usr/bin/env python
-import os, unittest
-from fn_helper import strarray_setup, compare_output
+import unittest
+from test.functional.fn_helper import compare_output, strarray_setup
 
 
 class TestSkip(unittest.TestCase):
-    @unittest.skip("FIXME: figure out why this doesn't work")
     def test_skip(self):
-
         # See that we can skip without parameter. (Same as 'skip 1'.)
-        cmds = ['skip', 'continue']
+        cmds = ["skip", "continue"]
         d = strarray_setup(cmds)
         d.core.start()
         ##############################
@@ -17,29 +14,24 @@ def test_skip(self):
         y = 7  # NOQA
         ##############################
         d.core.stop()
-        out = ['-- x = 4',    # x = 4 is shown in prompt, but not *run*.
-               '-- x = 5']
-        compare_output(self, out, d, cmds)
+        out = ["-- x = 4", "-- x = 5"]  # x = 4 is shown in prompt, but not *run*.
+        compare_output(self, out, d)
         self.assertEqual(5, x)  # Make sure lines were skipped.
 
         # See that we can skip with a count value
-        print("skipping second skip test")
-        return
-        cmds = ['skip 2', 'continue']
+        cmds = ["skip 2", "continue"]
         d = strarray_setup(cmds)
         d.core.start()
         ##############################
         x = 10
         x = 9
         z = 7  # NOQA
         ##############################
-        d.core.stop(options={'remove': True})
-        out = ['-- x = 10',     # x = 10 is shown in prompt, but not run.
-               '-- z = 7']
-        compare_output(self, out, d, cmds)
+        d.core.stop(options={"remove": True})
+        out = [
+            "-- x = 10",
+            "-- z = 7  # NOQA",
+        ]  # x = 10 is shown in prompt, but not run.
+        compare_output(self, out, d)
         self.assertEqual(5, x)  # Make sure x = 10, 9 were skipped.
         return
-    pass
-
-if __name__ == '__main__':
-    unittest.main()