[gs-cvs] rev 7703 - trunk/gs/toolbin/tests

[giles at ghostscript.com]

Author: giles
Date: 2007-02-15 02:58:50 -0800 (Thu, 15 Feb 2007)
New Revision: 7703

Modified:
   trunk/gs/toolbin/tests/gstestutils.py
Log:
Further atomicize the output of the test result lines.


Modified: trunk/gs/toolbin/tests/gstestutils.py
===================================================================
--- trunk/gs/toolbin/tests/gstestutils.py	2007-02-15 07:59:50 UTC (rev 7702)
+++ trunk/gs/toolbin/tests/gstestutils.py	2007-02-15 10:58:50 UTC (rev 7703)
@@ -143,21 +143,18 @@
     def addFailure(self, test, err):
         self.failures.append((test, err))
         if self.showAll:
-	    self.stream.write(self.getDescription(test))
-	    self.stream.write(" ... ")
 	    lines = err[1].args[0]
 	    if (len(lines) > 18) & (lines[0:18] == "non-zero exit code"):
-		self.stream.writeln("ERROR")
+		result = "ERROR"
 	    else:
-		self.stream.writeln("DIFFER")
+		result = "DIFFER"
+	    self.stream.writeln(self.getDescription(test) + " ... " + result)
         elif self.dots:
             self.stream.write("D")
 
     def addSuccess(self, test):
 	unittest.TestResult.addSuccess(self, test)
-	self.stream.write(self.getDescription(test))
-	self.stream.write(" ... ")
-	self.stream.writeln("ok")
+	self.stream.writeln(self.getDescription(test) + " ... ok")
 
     def printErrorList(self, flavor, errors):
         handoff = []