orca r3554 - in trunk: . test/harness

[wwalker svn gnome org]

Author: wwalker
Date: Sun Feb 10 18:42:09 2008
New Revision: 3554
URL: http://svn.gnome.org/viewvc/orca?rev=3554&view=rev

Log:
Adjust output of UNEXPECTED failures so they are easier to identify in the output log.


Modified:
   trunk/ChangeLog
   trunk/test/harness/utils.py

Modified: trunk/test/harness/utils.py
==============================================================================
--- trunk/test/harness/utils.py	(original)
+++ trunk/test/harness/utils.py	Sun Feb 10 18:42:09 2008
@@ -140,6 +140,9 @@
                 AssertPresentationAction.totalExpectedToFail += 1
                 print >> myErr, '[FAILURE WAS EXPECTED - ' \
                                 'LOOK FOR BUG? IN EXPECTED RESULTS]'
+            else:
+                print >> myErr, '[FAILURE WAS UNEXPECTED]'
+
     def __str__(self):
         return 'Assert Presentation Action: %s' % self._name
 
@@ -152,18 +155,13 @@
 
     def _printSummary(self):
         print >> myOut, \
-            "SUMMARY: %d SUCCEEDED and %d FAILED of %d for %s" \
+            "SUMMARY: %d SUCCEEDED and %d FAILED (%d UNEXPECTED) of %d for %s"\
             % (AssertPresentationAction.totalSucceed,
                AssertPresentationAction.totalFail,
+               (AssertPresentationAction.totalFail \
+               - AssertPresentationAction.totalExpectedToFail),
                AssertPresentationAction.totalCount,
                sys.argv[0])
-        if AssertPresentationAction.totalExpectedToFail \
-           != AssertPresentationAction.totalFail:
-            print >> myOut, \
-            "******** %d FAILURES NOT EXPECTED FOR %s" \
-            % (AssertPresentationAction.totalFail \
-               - AssertPresentationAction.totalExpectedToFail,
-               sys.argv[0])
 
     def __str__(self):
         return 'Start Recording Action'