Changeset 767a8ef

Timestamp:

May 18, 2022, 10:47:11 AM (3 years ago)

Author:

Andrew Beach <ajbeach@…>

Branches:

ADT, ast-experimental, master, pthread-emulation, qualifiedEnum

Children:

e6cf857f

Parents:

9939dc3

Message:

Test output now trims over-long test targets. Shorten the name (including directory) to 35 characters to avoid this.

Location:

tests

Files:

• pybin/settings.py (modified) (1 diff)
• pybin/test_run.py (modified) (1 diff)
• test.py (modified) (1 diff)

tests/pybin/settings.py

@@ -201 +201 @@
         global output_width
         output_width = max(map(lambda t: len(t.target()), tests))
+        # 35 is the maximum width of the name field before we get line wrapping.
+        output_width = min(output_width, 35)

tests/pybin/test_run.py

@@ -43 +43 @@
                 return os.path.normpath( os.path.join(settings.BUILDDIR, self.path, self.name) )
 
+        def format_target(self, width):
+                target = self.target()
+                length = len(target)
+                if length < width:
+                        return '{0:{width}}'.format(target, width=width)
+                elif length == width:
+                        return target
+                else:
+                        return '...' + target[3-width:]
+
         @staticmethod
         def valid_name(name):

tests/test.py

@@ -252 +252 @@
         try :
                 # print formated name
-                name_txt = '{0:{width}}  '.format(t.target(), width=settings.output_width)
+                name_txt = t.format_target(width=settings.output_width) + '  '
 
                 retcode, error, duration = run_single_test(t)