From 25223d679078dc756bbd8aea46f713259a4365ee Mon Sep 17 00:00:00 2001
From: Aaron Griffin <aaron@archlinux.org>
Date: Mon, 26 Feb 2007 08:19:02 +0000
Subject: * corrected (IMO) --debug usage with pactest.  --debug is now passed
 straight   through to pacman, whereas --verbose affects the pactest output -
 this cleans   up the standard test output significantly * sorted tests a bit
 better, sectioning off failed tests AFTER successful tests,   to make it
 easier to see what failed at a glance * added a 'testname' member to pmtest,
 which strips path info (cleaner output)

---
 pactest/pmenv.py | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

(limited to 'pactest/pmenv.py')

diff --git a/pactest/pmenv.py b/pactest/pmenv.py
index 9ea39676..9dfcf84f 100755
--- a/pactest/pmenv.py
+++ b/pactest/pmenv.py
@@ -19,6 +19,7 @@
 
 
 import os
+import os.path
 import time
 
 import pmtest
@@ -59,7 +60,7 @@ class pmenv:
 
         for t in self.testcases:
             print "=========="*8
-            print "Running '%s'" % t.name.replace(".py", "")
+            print "Running '%s'" % t.testname
 
             t.load()
             print t.description
@@ -88,33 +89,42 @@ class pmenv:
         """
         """
         passed = 0
-        print "=========="*8
-        print "Results"
-        print "----------"*8
+        tpassed = []
+        tfailed = []
         for test in self.testcases:
+            fail = test.result["fail"]
+            if fail == 0:
+                passed += 1
+                tpassed.append(test)
+            else:
+                tfailed.append(test)
+
+        def _printtest(t):
             success = test.result["success"]
             fail = test.result["fail"]
             rules = len(test.rules)
             if fail == 0:
                 print "[PASSED]",
-                passed += 1
             else:
                 print "[FAILED]",
-            print test.name.replace(".py", "").ljust(33),
-            print "Rules:",
-            print "OK = %2u  FAIL = %2u  SKIP = %2u" % \
-                    (success, fail, rules - (success + fail))
+            print "%s Rules:OK = %2u  FAIL = %2u  SKIP = %2u" \
+                    % (test.testname.ljust(32), success, fail, rules - (success + fail))
+
+        print "=========="*8
+        print "Results"
         print "----------"*8
+        for test in tpassed: _printtest(test)
+        print "----------"*8
+        for test in tfailed: _printtest(test)
+        print "----------"*8
+
         total = len(self.testcases)
         failed = total - passed
         print "TOTAL  = %3u" % total
         if total:
-            print "PASSED = %3u (%6.2f%%)" % \
-                    (passed, float(passed) * 100 / total)
-            print "FAILED = %3u (%6.2f%%)" % \
-                    (failed, float(failed) * 100 / total)
-        print
-
+            print "PASSED = %3u (%6.2f%%)" % (passed, float(passed) * 100 / total)
+            print "FAILED = %3u (%6.2f%%)" % (failed, float(failed) * 100 / total)
+        print ""
 
 if __name__ == "__main__":
     env = pmenv("/tmp")
-- 
cgit v1.2.3-24-g4f1b