[Commits] (heikki) Bug 1528, tinderbox reports builds failed even though only tests failed.

[commits at osafoundation.org]

Commit by: heikki
Modified files:
hardhat/buildscripts/newchandler.py 1.24 1.25
hardhat/tinderbox.py 1.11 1.12

Log message:
Bug 1528, tinderbox reports builds failed even though only tests failed.

ViewCVS links:
http://cvs.osafoundation.org/index.cgi/hardhat/buildscripts/newchandler.py.diff?r1=text&tr1=1.24&r2=text&tr2=1.25
http://cvs.osafoundation.org/index.cgi/hardhat/tinderbox.py.diff?r1=text&tr1=1.11&r2=text&tr2=1.12

Index: hardhat/tinderbox.py
diff -u hardhat/tinderbox.py:1.11 hardhat/tinderbox.py:1.12
--- hardhat/tinderbox.py:1.11	Fri Jul  9 10:27:01 2004
+++ hardhat/tinderbox.py	Sat Aug 21 00:15:43 2004
@@ -182,7 +182,7 @@
                  options.rsyncServer + ":continuous/" + buildNameNoSpaces])
                 hardhatutil.dumpOutputList(outputList, log)
 
-        elif ret == "build_failed":
+        elif ret[:12] == "build_failed":
             print "The build failed"
             log.write("The build failed\n")
             status = "build_failed"
@@ -198,7 +198,7 @@
             log = open(logFile, "w")
 
         
-        elif ret == "test_failed":
+        elif ret[:11] == "test_failed":
             print "Unit tests failed"
             log.write("Unit tests failed\n")
             status = "test_failed"

Index: hardhat/buildscripts/newchandler.py
diff -u hardhat/buildscripts/newchandler.py:1.24 hardhat/buildscripts/newchandler.py:1.25
--- hardhat/buildscripts/newchandler.py:1.24	Wed Aug  4 22:43:08 2004
+++ hardhat/buildscripts/newchandler.py	Sat Aug 21 00:15:42 2004
@@ -169,10 +169,9 @@
 
     except Exception, e:
         print "a testing error"
-        log.write("***Error during tests*** " + e.str() + "\n")
+        log.write("***Error during tests*** " + str(e) + "\n")
         log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")
         log.write("Tests log:" + "\n")
-        hardhatutil.dumpOutputList(outputList, log)
         if os.path.exists(os.path.join(workingDir, logPath)) :
             CopyLog(os.path.join(workingDir, logPath), log)
         log.write("- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -\n")