[Jython-checkins] SF.net SVN: jython: [3062] trunk/jython/Lib/test/regrtest.py

[<cg...@us...>]

Revision: 3062
          http://svn.sourceforge.net/jython/?rev=3062&view=rev
Author:   cgroves
Date:     2007-01-23 21:34:58 -0800 (Tue, 23 Jan 2007)

Log Message:
-----------
count the surprise skips and fails.  return 1 as the exit code if there are any or 0 if there are none

Modified Paths:
--------------
    trunk/jython/Lib/test/regrtest.py

Modified: trunk/jython/Lib/test/regrtest.py
===================================================================
--- trunk/jython/Lib/test/regrtest.py	2007-01-24 05:07:31 UTC (rev 3061)
+++ trunk/jython/Lib/test/regrtest.py	2007-01-24 05:34:58 UTC (rev 3062)
@@ -407,14 +407,13 @@
         if verbose:
             print "CAUTION:  stdout isn't compared in verbose mode:  a test"
             print "that passes in verbose mode may fail without it."
+    surprises = 0
     if skipped and not quiet:
 	print count(len(skipped), "test"), "skipped:"
-	printlist(skipped)
-	printsurprises(_Expected(_skips), skipped, 'skip')
+	surprises += countsurprises(_Expected(_skips), skipped, 'skip')
     if bad:
         print count(len(bad), "test"), "failed:"
-        printlist(bad)
-	printsurprises(_Expected(_failures), bad, 'fail')
+	surprises += countsurprises(_Expected(_failures), bad, 'fail')
 ##     if single:
 ##         alltests = findtests(testdir, stdtests, nottests)
 ##         for i in range(len(alltests)):
@@ -432,7 +431,7 @@
     if memo:
         savememo(memo,good,bad,skipped)
 
-    return len(bad) > 0
+    return surprises > 0
 
 
 STDTESTS = [
@@ -631,17 +630,21 @@
     if len(line) > indent:
         print line
 
-def printsurprises(e, actual, name):
-    plat = sys.platform
-    if e.isvalid():
-	surprise = _Set(actual) - e.getexpected()
+def countsurprises(expected, actual, name):
+    """returns the number of items in actual that aren't in expected."""
+    
+    printlist(actual)
+    if expected.isvalid():
+	surprise = _Set(actual) - expected.getexpected()
 	if surprise:
 	    print count(len(surprise), name), \
-		  "unexpected on", plat + ":"
+		  "unexpected on", sys.platform + ":"
 	    printlist(surprise)
+	return len(surprise)
     else:
 	print "Ask someone to teach regrtest.py about which tests are"
-	print "expected to %s on %s." % (name, plat)
+	print "expected to %s on %s." % (name, sys.platform)
+	return 1#Surprising not to know what to expect....
 
 class _Set:
     def __init__(self, seq=[]):


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.