[Buildbot-commits] buildbot/buildbot/process factory.py,1.8,1.9 step.py,1.61,1.62 base.py,1.47,1.48 interlock.py,1.6,1.7 step_twisted.py,1.67,1.68

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/process
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29418/buildbot/process

Modified Files:
	factory.py step.py base.py interlock.py step_twisted.py 
Log Message:
Revision: arch at buildbot.sf.net--2004/buildbot--dev--0--patch-83
Creator:  Brian Warner <warner at monolith.lothar.com>

Merged from org.apestaart at thomas/buildbot--waterfall--0--patch-22

Merged builder-categories and waterfall CSS work from Thomas. Also added
test-case-name tags.

Patches applied:

 * org.apestaart at thomas/buildbot--trial--0--base-0
   tag of org.apestaart at thomas/buildbot--releases--0.6.2--patch-2

 * org.apestaart at thomas/buildbot--trial--0--patch-1
   adding test-case-name

 * org.apestaart at thomas/buildbot--waterfall--0--base-0
   tag of org.apestaart at thomas/buildbot--releases--0.6.2--patch-2

 * org.apestaart at thomas/buildbot--waterfall--0--patch-1

 * org.apestaart at thomas/buildbot--waterfall--0--patch-2

 * org.apestaart at thomas/buildbot--waterfall--0--patch-3

 * org.apestaart at thomas/buildbot--waterfall--0--patch-4

 * org.apestaart at thomas/buildbot--waterfall--0--patch-5

 * org.apestaart at thomas/buildbot--waterfall--0--patch-6

 * org.apestaart at thomas/buildbot--waterfall--0--patch-7

 * org.apestaart at thomas/buildbot--waterfall--0--patch-8

 * org.apestaart at thomas/buildbot--waterfall--0--patch-9
   merge for test-case-name

 * org.apestaart at thomas/buildbot--waterfall--0--patch-10
   unittests + fixes for status.mail category filtering

 * org.apestaart at thomas/buildbot--waterfall--0--patch-11
   fix testsuite by prefixing page title with BuildBot

 * org.apestaart at thomas/buildbot--waterfall--0--patch-12
   move category from Builder to BuilderStatus

 * org.apestaart at thomas/buildbot--waterfall--0--patch-13
   fix silly bug, makes order in waterfall work again

 * org.apestaart at thomas/buildbot--waterfall--0--patch-14
   document category and categories for builders and statusclients

 * org.apestaart at thomas/buildbot--waterfall--0--patch-15
   remove prints from test_run

 * org.apestaart at thomas/buildbot--waterfall--0--patch-16
   remove FIXME and unneeded code for category

 * org.apestaart at thomas/buildbot--waterfall--0--patch-17
   put back "builders" argument

 * org.apestaart at thomas/buildbot--waterfall--0--patch-18
   use class_ to assign a class="" to the html blocks

 * org.apestaart at thomas/buildbot--waterfall--0--patch-19
   cssclass->class_

 * org.apestaart at thomas/buildbot--waterfall--0--patch-20
   give classes names as agreed

 * org.apestaart at thomas/buildbot--waterfall--0--patch-21
   finish class styling and add EXCEPTION result

 * org.apestaart at thomas/buildbot--waterfall--0--patch-22
   classic buildbot stylesheet


Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/base.py,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- base.py	22 Apr 2005 21:29:19 -0000	1.47
+++ base.py	24 Apr 2005 21:30:24 -0000	1.48
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_step -*-
 
 import types, time
 from StringIO import StringIO
@@ -283,7 +283,7 @@
             log.err(Failure())
             self.builder.builder_status.addPointEvent(["setupBuild",
                                                        "exception"],
-                                                      color="#c000c0")
+                                                      color="purple")
             self.finished = True
             self.results = FAILURE
             d = self.deferred
@@ -468,7 +468,7 @@
     def buildException(self, why):
         log.msg("%s.buildException" % self)
         log.err(why)
-        self.buildFinished(["build", "exception"], "#c000c0", FAILURE)
+        self.buildFinished(["build", "exception"], "purple", FAILURE)
 
     def buildFinished(self, text, color, results):
         """This method must be called when the last Step has completed. It

Index: factory.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/factory.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- factory.py	18 Apr 2005 00:26:56 -0000	1.8
+++ factory.py	24 Apr 2005 21:30:24 -0000	1.9
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_step -*-
 
 from buildbot import util
 from buildbot.process.base import Build

Index: interlock.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/interlock.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- interlock.py	19 Apr 2005 07:45:19 -0000	1.6
+++ interlock.py	24 Apr 2005 21:30:24 -0000	1.7
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_interlock -*-
 
 from twisted.python import log
 from buildbot.util import CancelableDeferred

Index: step.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- step.py	18 Apr 2005 00:26:56 -0000	1.61
+++ step.py	24 Apr 2005 21:30:24 -0000	1.62
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_steps -*-
 
 import time, random, types, re, warnings
 from email.Utils import formatdate
@@ -11,7 +11,8 @@
 
 from buildbot.util import now
 from buildbot.status import progress, builder
-from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, SKIPPED
+from buildbot.status.builder import SUCCESS, WARNINGS, FAILURE, SKIPPED, \
+     EXCEPTION
 
 """
 BuildStep and RemoteCommand classes for master-side representation of the
@@ -554,10 +555,10 @@
             self.addHTMLLog("err.html", formatFailure(why))
             self.addCompleteLog("err.text", why.getTraceback())
             # could use why.getDetailedTraceback() for more information
-            self.step_status.setColor("#c000c0")
+            self.step_status.setColor("purple")
             self.step_status.setText([self.name, "exception"])
             self.step_status.setText2([self.name])
-            self.step_status.stepFinished(FAILURE)
+            self.step_status.stepFinished(EXCEPTION)
         except:
             log.msg("exception during failure processing")
             log.err()

Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -d -r1.67 -r1.68
--- step_twisted.py	18 Apr 2005 00:26:57 -0000	1.67
+++ step_twisted.py	24 Apr 2005 21:30:25 -0000	1.68
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+# -*- test-case-name: buildbot.test.test_twisted -*-
 
 from twisted.python import log, failure