Sync with trepan3k

Author: rocky

test/data/highlight.right

@@ -1,5 +1,5 @@
 (gcd.py:10): <module>
--> 10 """
+-> 10 """
 Set basename (short filenames) in debugger output is on.
 Set event tracing is on.
 Set stopping before def or class statements is off.

test/data/step.right

@@ -1,24 +1,24 @@
 (gcd.py:10): <module>
--> 10 """
+-> 10 """
 Set basename (short filenames) in debugger output is on.
 Set event tracing is on.
 Set stopping before def or class statements is off.
 Set confirmation of potentially dangerous operations is off.
 line - gcd.py:10
 line - gcd.py:11
 (gcd.py:11): <module>
--- 11 import sys
- 11  ->	import sys
+-- 11 import sys
+ 11  ->	import sys
 Set stopping before def or class statements is on.
 line - gcd.py:13
 line - gcd.py:26
 line - gcd.py:40
 (gcd.py:40): <module>
--- 40 if __name__=='__main__':
- 40  ->	if __name__=='__main__':
+-- 40 if __name__=='__main__':
+ 40  ->	if __name__=='__main__':
 Set stopping before def or class statements is off.
 line - gcd.py:41
 (gcd.py:41): <module>
--- 41     check_args()
- 41  ->	    check_args()
+-- 41     check_args()
+ 41  ->	    check_args()
 trepan2: That's all, folks...

test/integration/helper.py

@@ -1,40 +1,43 @@
-import difflib, os, re, sys, time
 from xdis import IS_PYPY
-
-srcdir = os.path.abspath(os.path.dirname(__file__))
+import difflib, os, re, sys, time
+import os.path as osp
+srcdir = osp.abspath(osp.dirname(__file__))
 
 
 def run_debugger(testname, python_file, dbgr_opts='', args='',
-                 outfile=None):
-    datadir   = os.path.join(srcdir, '..', 'data')
-    progdir   = os.path.join(srcdir, '..', 'example')
-    dbgrdir   = os.path.join(srcdir, '..', '..', 'trepan')
+                 outfile=None, right_template=None):
+    datadir   = osp.join(srcdir, '..', 'data')
+    progdir   = osp.join(srcdir, '..', 'example')
+    dbgrdir   = osp.join(srcdir, '..', '..', 'trepan')
     dbgr_short= "__main__.py"
-    dbgr_path = os.path.join(dbgrdir, dbgr_short)
+    dbgr_path = osp.join(dbgrdir, dbgr_short)
 
-    if IS_PYPY:
-        rightfile = os.path.join(datadir, "%s-pypy.right" % testname)
-    else:
-        rightfile = os.path.join(datadir, "%s.right" % testname)
+    if not right_template:
+        if IS_PYPY:
+            right_template = "%s-pypy.right"
+        else:
+            right_template = "%s.right"
+
+    rightfile = osp.join(datadir, right_template % testname)
 
-    sys.path.insert(0, os.path.join(srcdir, '..', '..'))
+    sys.path.insert(0, osp.join(srcdir, '..', '..'))
     os.environ['PYTHONPATH'] = os.pathsep.join(sys.path)
-    cmdfile     = os.path.join(datadir, "%s.cmd"   % testname)
-    outfile     = os.path.join(srcdir, "%s.out" % testname)
+    cmdfile     = osp.join(datadir, "%s.cmd"   % testname)
+    outfile     = osp.join(srcdir, "%s.out" % testname)
     if python_file:
-        programfile = os.path.join(progdir, python_file)
+        programfile = osp.join(progdir, python_file)
     else:
         programfile = ''
         pass
 
     outfile_opt = '--output=%s ' % outfile
 
-    if os.path.exists(outfile): os.unlink(outfile)
+    if osp.exists(outfile): os.unlink(outfile)
 
     cmd = "%s --command %s %s %s %s %s" % \
           (dbgr_path, cmdfile, outfile_opt, dbgr_opts, programfile, args)
 
-    print(cmd)
+    # print(cmd)
     os.system(cmd)
     fromfile  = rightfile
     fromdate  = time.ctime(os.stat(fromfile).st_mtime)

test/integration/test-general.py

@@ -9,9 +9,14 @@ class GeneralTests(unittest.TestCase):
 
     def test_step(self):
         """Test stepping, set skip, set trace"""
-        result=Mhelper.run_debugger(testname='step',
-                                    dbgr_opts='--basename --highlight=plain',
-                                    python_file='gcd.py')
+        right_template = None
+        result = Mhelper.run_debugger(
+            testname="step",
+            dbgr_opts="--basename --highlight=plain",
+            python_file="gcd.py",
+            right_template=right_template,
+        )
+
         self.assertEqual(True, result, "debugger 'step' command comparision")
         return
     pass

test/integration/test-highlight.py

@@ -3,19 +3,27 @@
 import unittest
 
 import helper as Mhelper
+from xdis import PYTHON_VERSION_TRIPLE
 
 
 class GeneralTests(unittest.TestCase):
-
     def test_macro(self):
         """Test set/show highlight"""
-        result=Mhelper.run_debugger(testname='highlight',
-                                    dbgr_opts='--basename ' +
-                                    '--highlight=plain --nx',
-                                    python_file='gcd.py')
+        if PYTHON_VERSION_TRIPLE >= (3, 8):
+            right_template = "%s-38.right"
+        else:
+            right_template = None
+        result = Mhelper.run_debugger(
+            testname="highlight",
+            dbgr_opts="--basename " + "--highlight=plain --nx",
+            python_file="gcd.py",
+            right_template=right_template,
+        )
         self.assertEqual(True, result, "'highlight' command comparision")
         return
+
     pass
 
+
 if __name__ == "__main__":
     unittest.main()