From warner at users.sourceforge.net  Sun Nov  7 20:09:09 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 07 Nov 2004 20:09:09 +0000
Subject: [Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.23,1.24
Message-ID: <E1CQtLa-000389-AB@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12002/docs/examples

Modified Files:
	twisted_master.cfg 
Log Message:
update to match current usage on the Twisted buildbot


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- twisted_master.cfg	1 Oct 2004 01:56:29 -0000	1.23
+++ twisted_master.cfg	7 Nov 2004 20:09:07 -0000	1.24
@@ -20,6 +20,7 @@
 from buildbot.status import html, words, client, mail
 
 import private # holds passwords
+reload(private) # make it possible to change the contents without a restart
 
 # I set really=False when testing this configuration at home
 really = True
@@ -141,8 +142,10 @@
 b23osx = {'name': "OS-X",
           'slavename': "bot-OSX",
           'builddir': "OSX-full2.3",
-          'factory': FullTwistedBuildFactory(svnurl,
-                                             python="python2.3"),
+          'factory': TwistedReactorsBuildFactory(svnurl,
+                                                 python="python2.3",
+                                                 reactors=["default", "cf"],
+                                                 ),
           }
 builders.append(b23osx)
 
@@ -159,12 +162,12 @@
 builders.append(b22w32)
 
 b23bsd = {'name': "freebsd",
-          'slavename': "bot-freebsd",
+          'slavename': "bot-dialtone",
           'builddir': "bsd-full2.2",
           'factory': TwistedReactorsBuildFactory(svnurl,
                                                  python="python2.3",
                                                  reactors=["default",
-                                                           #"kqueue",
+                                                           "kqueue",
                                                            ]),
           }
 builders.append(b23bsd)
@@ -199,7 +202,8 @@
 c['interlocks'] = [("do-deb", ["full-2.2"], ["debuild"])]
 c['status'].append(client.PBListener(9936))
 m = mail.MailNotifier(fromaddr="buildbot at twistedmatrix.com",
-                      sendToInterestedUsers=False,
+                      builders=["quick", "full-2.2", "full-2.3", "full-2.4"],
+                      sendToInterestedUsers=True,
 		      extraRecipients=["warner at lothar.com"],
 		      mode="problem",
 		      )




From warner at users.sourceforge.net  Sun Nov  7 20:09:10 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 07 Nov 2004 20:09:10 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.299,1.300
Message-ID: <E1CQtLb-00038H-Bf@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
update to match current usage on the Twisted buildbot


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -d -r1.299 -r1.300
--- ChangeLog	29 Oct 2004 18:03:42 -0000	1.299
+++ ChangeLog	7 Nov 2004 20:09:07 -0000	1.300
@@ -1,3 +1,8 @@
+2004-11-07  Brian Warner  <warner at lothar.com>
+
+	* docs/examples/twisted_master.cfg: update to match current usage
+	on the Twisted buildbot
+
 2004-10-29  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/mail.py (MailNotifier): fix typo in docs




From warner at users.sourceforge.net  Sun Nov  7 20:17:36 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 07 Nov 2004 20:17:36 +0000
Subject: [Buildbot-commits] buildbot/docs/examples twisted_master.cfg,1.24,1.25
Message-ID: <E1CQtTl-0003k3-2z@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/docs/examples
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14377

Modified Files:
	twisted_master.cfg 
Log Message:
also add manhole clause


Index: twisted_master.cfg
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/examples/twisted_master.cfg,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- twisted_master.cfg	7 Nov 2004 20:09:07 -0000	1.24
+++ twisted_master.cfg	7 Nov 2004 20:17:34 -0000	1.25
@@ -200,6 +200,8 @@
 
 c['debugPassword'] = private.debugPassword
 c['interlocks'] = [("do-deb", ["full-2.2"], ["debuild"])]
+if hasattr(private, "manhole"):
+    c['manhole'] = master.Manhole(*private.manhole)
 c['status'].append(client.PBListener(9936))
 m = mail.MailNotifier(fromaddr="buildbot at twistedmatrix.com",
                       builders=["quick", "full-2.2", "full-2.3", "full-2.4"],




From warner at users.sourceforge.net  Sun Nov  7 20:32:50 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 07 Nov 2004 20:32:50 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process builder.py,1.17,1.18
Message-ID: <E1CQtiU-0004Yt-T3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
(Builder._detached): clear the self.currentBuild reference, otherwise the
next build will be skipped because we think the Builder is already in use.


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/builder.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- builder.py	30 Sep 2004 10:05:43 -0000	1.17
+++ builder.py	7 Nov 2004 20:32:47 -0000	1.18
@@ -181,6 +181,7 @@
         if self.currentBuild:
             # wasn't enough
             self.currentBuild.stopBuild("slave lost")
+            self.currentBuild = None
             # TODO: should failover to a new Build
         self.builder_status.addPointEvent(['disconnect'])
         self.builder_status.currentlyOffline()




From warner at users.sourceforge.net  Sun Nov  7 20:32:51 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 07 Nov 2004 20:32:51 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.300,1.301
Message-ID: <E1CQtid-0004Yz-G1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(Builder._detached): clear the self.currentBuild reference, otherwise the
next build will be skipped because we think the Builder is already in use.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.300
retrieving revision 1.301
diff -u -d -r1.300 -r1.301
--- ChangeLog	7 Nov 2004 20:09:07 -0000	1.300
+++ ChangeLog	7 Nov 2004 20:32:48 -0000	1.301
@@ -1,5 +1,9 @@
 2004-11-07  Brian Warner  <warner at lothar.com>
 
+	* buildbot/process/builder.py (Builder._detached): clear the
+	self.currentBuild reference, otherwise the next build will be
+	skipped because we think the Builder is already in use.
+
 	* docs/examples/twisted_master.cfg: update to match current usage
 	on the Twisted buildbot
 




From warner at users.sourceforge.net  Mon Nov  8 09:03:23 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:03:23 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_maildir.py,1.2,1.3
Message-ID: <E1CR5Qp-0003Yt-Is@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	test_maildir.py 
Log Message:
* buildbot/scripts/runner.py (createMaster): use shutil.copy()
instead of the unix-specific os.system("cp"), thanks to Elliot
Murphy for this and the other buildbot-vs-windows catches.
* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same

* contrib/windows/buildbot.bat: prefix a '@', apparently to not
echo the command as it is run

* setup.py: install sample.mk too, not just sample.cfg
(scripts): install contrib/windows/buildbot.bat on windows


Index: test_maildir.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_maildir.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- test_maildir.py	14 Oct 2004 17:28:34 -0000	1.2
+++ test_maildir.py	8 Nov 2004 09:03:20 -0000	1.3
@@ -36,7 +36,7 @@
         print "delivering", msg
         newdir = os.path.join(self.maildir, "new")
         # to do this right, use safecat
-        os.system("cp %s %s/" % (msg, newdir))
+        shutil.copy(msg, newdir)
 
     def timeout(self):
         self.done = 1




From warner at users.sourceforge.net  Mon Nov  8 09:03:22 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:03:22 +0000
Subject: [Buildbot-commits] buildbot/contrib/windows buildbot.bat,1.1,1.2
Message-ID: <E1CR5Qp-0003Yq-JD@sc8-pr-cvs1.sourceforge.net>

Update of /cvsroot/buildbot/buildbot/contrib/windows
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13669/contrib/windows

Modified Files:
	buildbot.bat 
Log Message:
* buildbot/scripts/runner.py (createMaster): use shutil.copy()
instead of the unix-specific os.system("cp"), thanks to Elliot
Murphy for this and the other buildbot-vs-windows catches.
* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same

* contrib/windows/buildbot.bat: prefix a '@', apparently to not
echo the command as it is run

* setup.py: install sample.mk too, not just sample.cfg
(scripts): install contrib/windows/buildbot.bat on windows


Index: buildbot.bat
===================================================================
RCS file: /cvsroot/buildbot/buildbot/contrib/windows/buildbot.bat,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- buildbot.bat	14 Oct 2004 16:48:47 -0000	1.1
+++ buildbot.bat	8 Nov 2004 09:03:20 -0000	1.2
@@ -1,2 +1,2 @@
-python C:\Python23\Scripts\buildbot %*
+ at python C:\Python23\Scripts\buildbot %*
 




From warner at users.sourceforge.net  Mon Nov  8 09:03:23 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:03:23 +0000
Subject: [Buildbot-commits] buildbot/buildbot/scripts runner.py,1.6,1.7
Message-ID: <E1CR5Qp-0003Yx-St@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	runner.py 
Log Message:
* buildbot/scripts/runner.py (createMaster): use shutil.copy()
instead of the unix-specific os.system("cp"), thanks to Elliot
Murphy for this and the other buildbot-vs-windows catches.
* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same

* contrib/windows/buildbot.bat: prefix a '@', apparently to not
echo the command as it is run

* setup.py: install sample.mk too, not just sample.cfg
(scripts): install contrib/windows/buildbot.bat on windows


Index: runner.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/scripts/runner.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- runner.py	14 Oct 2004 16:47:33 -0000	1.6
+++ runner.py	8 Nov 2004 09:03:21 -0000	1.7
@@ -1,6 +1,6 @@
 #! /usr/bin/python
 
-import os, os.path, sys
+import os, os.path, sys, shutil
 from twisted.python import usage, util
 
 # this is mostly just a front-end for mktap, twistd, and kill(1), but in the
@@ -38,8 +38,7 @@
         print "installing sample in master.cfg.sample instead"
         target = "master.cfg.sample"
     sampleconfig = util.sibpath(__file__, "sample.cfg")
-    cmd = "cp %s %s" % (sampleconfig, target)
-    os.system(cmd)
+    shutil.copy(sampleconfig, target)
 
     target = "Makefile"
     if os.path.exists(target):
@@ -47,8 +46,7 @@
         print "installing sample in Makefile.sample instead"
         target = "Makefile.sample"
     samplemk = util.sibpath(__file__, "sample.mk")
-    cmd = "cp %s %s" % (samplemk, target)
-    os.system(cmd)
+    shutil.copy(samplemk, target)
 
     if not quiet: print "buildmaster configured in %s" % basedir
     sys.exit(0)




From warner at users.sourceforge.net  Mon Nov  8 09:03:24 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:03:24 +0000
Subject: [Buildbot-commits] buildbot setup.py,1.29,1.30 ChangeLog,1.301,1.302
Message-ID: <E1CR5Qr-0003ZA-1C@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	setup.py ChangeLog 
Log Message:
* buildbot/scripts/runner.py (createMaster): use shutil.copy()
instead of the unix-specific os.system("cp"), thanks to Elliot
Murphy for this and the other buildbot-vs-windows catches.
* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same

* contrib/windows/buildbot.bat: prefix a '@', apparently to not
echo the command as it is run

* setup.py: install sample.mk too, not just sample.cfg
(scripts): install contrib/windows/buildbot.bat on windows


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.301
retrieving revision 1.302
diff -u -d -r1.301 -r1.302
--- ChangeLog	7 Nov 2004 20:32:48 -0000	1.301
+++ ChangeLog	8 Nov 2004 09:03:21 -0000	1.302
@@ -1,3 +1,16 @@
+2004-11-08  Brian Warner  <warner at lothar.com>
+
+	* buildbot/scripts/runner.py (createMaster): use shutil.copy()
+	instead of the unix-specific os.system("cp"), thanks to Elliot
+	Murphy for this and the other buildbot-vs-windows catches.
+	* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same
+
+	* contrib/windows/buildbot.bat: prefix a '@', apparently to not
+	echo the command as it is run
+
+	* setup.py: install sample.mk too, not just sample.cfg
+	(scripts): install contrib/windows/buildbot.bat on windows
+
 2004-11-07  Brian Warner  <warner at lothar.com>
 
 	* buildbot/process/builder.py (Builder._detached): clear the

Index: setup.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/setup.py,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- setup.py	24 Sep 2004 07:21:53 -0000	1.29
+++ setup.py	8 Nov 2004 09:03:21 -0000	1.30
@@ -1,5 +1,6 @@
 #! /usr/bin/python
 
+import sys
 from distutils.core import setup
 from buildbot import version
 
@@ -31,6 +32,10 @@
 improve.
 """
 
+scripts = ["bin/buildbot"]
+if sys.platform == "win32":
+    scripts.append("contrib/windows/buildbot.bat")
+
 setup(name="buildbot",
       version=version,
       description="BuildBot build automation system",
@@ -48,8 +53,9 @@
                 "buildbot.scripts",
                 "buildbot.test"],
       data_files=[("buildbot", ["buildbot/plugins.tml"]),
-                  ("buildbot/scripts", ["buildbot/scripts/sample.cfg"]),],
-      scripts = ["bin/buildbot"],
+                  ("buildbot/scripts", ["buildbot/scripts/sample.cfg",
+                                        "buildbot/scripts/sample.mk"]),],
+      scripts = scripts,
       cmdclass={'install_data': install_data_twisted},
       )
 




From warner at users.sourceforge.net  Mon Nov  8 09:50:19 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:50:19 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process step_twisted.py,1.61,1.62
Message-ID: <E1CR6AF-0006OS-SB@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	step_twisted.py 
Log Message:
(Trial.createSummary): survive when there are no test failures to be parsed


Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -d -r1.61 -r1.62
--- step_twisted.py	19 Oct 2004 18:41:40 -0000	1.61
+++ step_twisted.py	8 Nov 2004 09:50:17 -0000	1.62
@@ -524,6 +524,10 @@
 # SKIPPED: testRETR (twisted.test.test_ftp.TestFTPServer)
 # FAILURE: testBatchFile (twisted.conch.test.test_sftp.TestOurServerBatchFile)
                         r = re.search(r'^([^:]+): (\w+) \(([\w\.]+)\)', line)
+                        if not r:
+                            # TODO: cleanup, if there are no problems,
+                            # we hit here
+                            continue
                         result, name, case = r.groups()
                         testname = tuple(case.split(".") + [name])
                         results = {'SKIPPED': SKIPPED,




From warner at users.sourceforge.net  Mon Nov  8 09:50:20 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 09:50:20 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.302,1.303
Message-ID: <E1CR6AG-0006OX-AC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(Trial.createSummary): survive when there are no test failures to be parsed


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.302
retrieving revision 1.303
diff -u -d -r1.302 -r1.303
--- ChangeLog	8 Nov 2004 09:03:21 -0000	1.302
+++ ChangeLog	8 Nov 2004 09:50:17 -0000	1.303
@@ -1,5 +1,8 @@
 2004-11-08  Brian Warner  <warner at lothar.com>
 
+	* buildbot/process/step_twisted.py (Trial.createSummary): survive
+	when there are no test failures to be parsed
+
 	* buildbot/scripts/runner.py (createMaster): use shutil.copy()
 	instead of the unix-specific os.system("cp"), thanks to Elliot
 	Murphy for this and the other buildbot-vs-windows catches.




From warner at users.sourceforge.net  Mon Nov  8 19:38:12 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 19:38:12 +0000
Subject: [Buildbot-commits] buildbot/buildbot/changes pb.py,1.3,1.4
Message-ID: <E1CRFLA-0002dd-MZ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	pb.py 
Log Message:
(ChangePerspective): use a configurable separator character instead of
os.sep, because the filenames being split here are coming from the VC system,
which can have a different pathname convention than the local host. This
should help a buildmaster running on windows that uses a CVS repository which
runs under unix.


Index: pb.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/pb.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pb.py	8 Sep 2004 19:15:30 -0000	1.3
+++ pb.py	8 Nov 2004 19:38:09 -0000	1.4
@@ -10,9 +10,13 @@
 
 class ChangePerspective(NewCredPerspective):
 
-    def __init__(self, changemaster, prefix):
+    def __init__(self, changemaster, prefix, sep="/"):
         self.changemaster = changemaster
         self.prefix = prefix
+        # this is the separator as used by the VC system, not the local host.
+        # If for some reason you're running your CVS repository under
+        # windows, you'll need to use a PBChangeSource(sep="\\")
+        self.sep = sep
 
     def attached(self, mind):
         pass
@@ -22,10 +26,10 @@
         pathnames = []
         for path in changedict['files']:
             if self.prefix:
-                bits = path.split(os.sep)
+                bits = path.split(self.sep)
                 if bits[0] == self.prefix:
                     if bits[1:]:
-                        path = os.path.join(*bits[1:])
+                        path = self.sep.join(bits[1:])
                     else:
                         path = ''
                 else:
@@ -43,7 +47,7 @@
     __implements__ = IChangeSource, service.Service.__implements__
 
     def __init__(self, user="change", passwd="changepw", port=None,
-                 prefix=None):
+                 prefix=None, sep="/"):
         # TODO: current limitations
         assert user == "change"
         assert passwd == "changepw"
@@ -52,6 +56,7 @@
         self.passwd = passwd
         self.port = port
         self.prefix = prefix
+        self.sep = sep
 
     def describe(self):
         # TODO: when the dispatcher is fixed, report the specific port
@@ -76,5 +81,5 @@
         master.dispatcher.unregister(self.user)
 
     def getPerspective(self):
-        return ChangePerspective(self.parent, self.prefix)
+        return ChangePerspective(self.parent, self.prefix, self.sep)
 




From warner at users.sourceforge.net  Mon Nov  8 19:43:54 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 19:43:54 +0000
Subject: [Buildbot-commits] buildbot/buildbot/changes mail.py,1.14,1.15
Message-ID: <E1CRFQg-0002xo-7m@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	mail.py 
Log Message:
* buildbot/changes/pb.py (ChangePerspective): use a configurable
separator character instead of os.sep, because the filenames being
split here are coming from the VC system, which can have a
different pathname convention than the local host. This should
help a buildmaster running on windows that uses a CVS repository
which runs under unix.

* buildbot/changes/mail.py (MaildirSource): same, for all parsers


Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/changes/mail.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- mail.py	12 Oct 2004 17:51:04 -0000	1.14
+++ mail.py	8 Nov 2004 19:43:51 -0000	1.15
@@ -11,7 +11,7 @@
 from buildbot.changes.maildirtwisted import MaildirTwisted
 from buildbot.changes.changes import Change
 
-def parseFreshCVSMail(self, fd, prefix=None):
+def parseFreshCVSMail(self, fd, prefix=None, sep="/"):
     """Parse mail sent by FreshCVS"""
     # this uses rfc822.Message so it can run under python2.1 . In the future
     # it will be updated to use python2.2's "email" module.
@@ -50,9 +50,9 @@
         if prefix:
             # insist that the file start with the prefix: FreshCVS sends
             # changes we don't care about too
-            bits = file.split(os.sep)
+            bits = file.split(sep)
             if bits[0] == prefix:
-                file = apply(os.path.join, bits[1:])
+                file = sep.join(bits[1:])
             else:
                 break
         if len(linebits) == 1:
@@ -81,7 +81,7 @@
 
     return change
 
-def parseSyncmail(self, fd, prefix=None):
+def parseSyncmail(self, fd, prefix=None, sep="/"):
     """Parse messages sent by the 'syncmail' program, as suggested by the
     sourceforge.net CVS Admin documentation. Syncmail is maintained at
     syncmail.sf.net .
@@ -152,18 +152,18 @@
         # separator conventions established by the remote CVS server (which
         # is probably running on unix), not the local buildmaster system.
         thesefiles = line.split(" ")
-        for file in thesefiles:
-            file = os.path.join(directory, file)
+        for f in thesefiles:
+            f = sep.join([directory, f])
             if prefix:
                 # insist that the file start with the prefix: we may get
                 # changes we don't care about too
-                bits = file.split(os.sep)
+                bits = f.split(sep)
                 if bits[0] == prefix:
-                    file = apply(os.path.join, bits[1:])
+                    f = sep.join(bits[1:])
                 else:
                     break
             # TODO: figure out how new directories are described, set .isdir
-            files.append(file)
+            files.append(f)
 
     if not files:
         return None
@@ -288,15 +288,17 @@
     parser = None
     name = None
 
-    def __init__(self, maildir, prefix=None):
+    def __init__(self, maildir, prefix=None, sep="/"):
         MaildirTwisted.__init__(self, maildir)
         self.prefix = prefix
+        self.sep = sep
+
     def describe(self):
         return "%s mailing list in maildir %s" % (self.name, self.basedir)
 
     def messageReceived(self, filename):
         path = os.path.join(self.basedir, "new", filename)
-        change = self.parser(open(path, "r"), self.prefix)
+        change = self.parser(open(path, "r"), self.prefix, self.sep)
         if change:
             self.parent.addChange(change)
         os.rename(os.path.join(self.basedir, "new", filename),




From warner at users.sourceforge.net  Mon Nov  8 21:19:41 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 21:19:41 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py,1.39,1.40
Message-ID: <E1CRGvN-0000Zi-WF@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
(BuilderStatus.saveYourself): w32 can't do os.rename() onto an existing file,
so catch the exception and unlink the target file first. This introduces a
slight window where the existing file could be lost, but the main failure
case (disk full) should still be handled safely.
(BuildStatus.saveYourself): same


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- builder.py	15 Oct 2004 16:59:44 -0000	1.39
+++ builder.py	8 Nov 2004 21:19:39 -0000	1.40
@@ -757,7 +757,12 @@
         tmpfilename = filename + ".tmp"
         try:
             pickle.dump(self, open(tmpfilename, "w"), -1)
-            os.rename(tmpfilename, filename)
+            try:
+                os.rename(tmpfilename, filename)
+            except OSError:
+                # windows cannot rename a file on top of an existing one
+                os.unlink(filename)
+                os.rename(tmpfilename, filename)
         except Exception, e:
             log.msg("unable to save build %s-#%d" % (self.builder.name,
                                                      self.number))
@@ -843,7 +848,12 @@
         tmpfilename = filename + ".tmp"
         try:
             pickle.dump(self, open(tmpfilename, "w"), -1)
-            os.rename(tmpfilename, filename)
+            try:
+                os.rename(tmpfilename, filename)
+            except OSError:
+                # windows cannot rename a file on top of an existing one
+                os.unlink(filename)
+                os.rename(tmpfilename, filename)
         except Exception, e:
             log.msg("unable to save builder %s" % self.name)
             log.err()




From warner at users.sourceforge.net  Mon Nov  8 21:20:09 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 08 Nov 2004 21:20:09 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.303,1.304
Message-ID: <E1CRGvr-0000cF-3h@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
*** empty log message ***

Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -d -r1.303 -r1.304
--- ChangeLog	8 Nov 2004 09:50:17 -0000	1.303
+++ ChangeLog	8 Nov 2004 21:20:07 -0000	1.304
@@ -1,5 +1,20 @@
 2004-11-08  Brian Warner  <warner at lothar.com>
 
+	* buildbot/status/builder.py (BuilderStatus.saveYourself): w32
+	can't do os.rename() onto an existing file, so catch the exception
+	and unlink the target file first. This introduces a slight window
+	where the existing file could be lost, but the main failure case
+	(disk full) should still be handled safely.
+	(BuildStatus.saveYourself): same
+
+	* buildbot/changes/pb.py (ChangePerspective): use a configurable
+	separator character instead of os.sep, because the filenames being
+	split here are coming from the VC system, which can have a
+	different pathname convention than the local host. This should
+	help a buildmaster running on windows that uses a CVS repository
+	which runs under unix.
+	* buildbot/changes/mail.py (MaildirSource): same, for all parsers
+
 	* buildbot/process/step_twisted.py (Trial.createSummary): survive
 	when there are no test failures to be parsed
 




From warner at users.sourceforge.net  Thu Nov 11 00:43:50 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 00:43:50 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_status.py,1.10,1.11
Message-ID: <E1CS343-0003qI-Ba@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	test_status.py 
Log Message:
* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date
header to outbound mail
* buildbot/test/test_status.py (Mail.testBuild1): test for same


Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- test_status.py	15 Oct 2004 16:59:43 -0000	1.10
+++ test_status.py	11 Nov 2004 00:43:48 -0000	1.11
@@ -91,6 +91,7 @@
                           "recip at example.com\n", t)
         self.failUnlessIn("From: buildbot at example.com\n", t)
         self.failUnlessIn("Subject: buildbot success in builder1\n", t)
+        self.failUnlessIn("Date: ", t)
         self.failUnlessIn("Build succeeded!\n", t)
         self.failUnlessIn("Buildbot URL: BUILDBOT_URL\n", t)
 




From warner at users.sourceforge.net  Thu Nov 11 00:43:51 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 00:43:51 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status mail.py,1.11,1.12
Message-ID: <E1CS343-0003qM-H3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	mail.py 
Log Message:
* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date
header to outbound mail
* buildbot/test/test_status.py (Mail.testBuild1): test for same


Index: mail.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/mail.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- mail.py	29 Oct 2004 18:03:41 -0000	1.11
+++ mail.py	11 Nov 2004 00:43:48 -0000	1.12
@@ -3,6 +3,7 @@
 # the email.MIMEMultipart module is only available in python-2.2.2 and later
 
 from email.Message import Message
+from email.Utils import formatdate
 from email.MIMEText import MIMEText
 try:
     from email.MIMEMultipart import MIMEMultipart
@@ -254,6 +255,7 @@
             m = Message()
             m.set_payload(text)
 
+        m['Date'] = formatdate(localtime=True)
         m['Subject'] = self.subject % { 'result': res,
                                         'builder': name,
                                         }




From warner at users.sourceforge.net  Thu Nov 11 00:43:51 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 00:43:51 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.304,1.305
Message-ID: <E1CS343-0003qV-P3@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date
header to outbound mail
* buildbot/test/test_status.py (Mail.testBuild1): test for same


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.304
retrieving revision 1.305
diff -u -d -r1.304 -r1.305
--- ChangeLog	8 Nov 2004 21:20:07 -0000	1.304
+++ ChangeLog	11 Nov 2004 00:43:49 -0000	1.305
@@ -1,3 +1,9 @@
+2004-11-10  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date
+	header to outbound mail
+	* buildbot/test/test_status.py (Mail.testBuild1): test for same
+
 2004-11-08  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/builder.py (BuilderStatus.saveYourself): w32




From warner at users.sourceforge.net  Thu Nov 11 19:31:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 19:31:17 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py,1.40,1.41
Message-ID: <E1CSKf8-0006f6-2R@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): Merge string
chunks together, up to 10kb per chunk. This ought to cut down on
the CPU-burning overhead of large log files. Thanks to Alexander
Staubo for spotting the problem.
* buildbot/test/test_status.py (Log): tests for same


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- builder.py	8 Nov 2004 21:19:39 -0000	1.40
+++ builder.py	11 Nov 2004 19:31:15 -0000	1.41
@@ -125,7 +125,15 @@
 
     def addEntry(self, channel, text):
         assert not self.finished
-        self.entries.append((channel, text))
+        if (self.entries
+            and channel == self.entries[-1][0]
+            and len(self.entries[-1][1]) < 10000):
+            # merge same-category chunks together, up to 10kb each, to cut
+            # down on overhead when assembling these into a single big string
+            # later.
+            self.entries[-1] = (channel, self.entries[-1][1] + text)
+        else:
+            self.entries.append((channel, text))
         for w in self.watchers:
             w.logChunk(self.step.build, self.step, self, channel, text)
         self.length += len(text)




From warner at users.sourceforge.net  Thu Nov 11 19:31:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 19:31:17 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_status.py,1.11,1.12
Message-ID: <E1CSKf7-0006f4-VX@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	test_status.py 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): Merge string
chunks together, up to 10kb per chunk. This ought to cut down on
the CPU-burning overhead of large log files. Thanks to Alexander
Staubo for spotting the problem.
* buildbot/test/test_status.py (Log): tests for same


Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- test_status.py	11 Nov 2004 00:43:48 -0000	1.11
+++ test_status.py	11 Nov 2004 19:31:06 -0000	1.12
@@ -235,3 +235,48 @@
         self.failUnlessEqual(t.getResults(), builder.SUCCESS)
         self.failUnlessEqual(t.getText(), ["passed"])
         self.failUnlessEqual(t.getLogs(), {'output': ""})
+
+class Log(unittest.TestCase):
+    def testAdd(self):
+        l = builder.LogFile(None)
+        l.name = "compile"
+        l.step = 13
+        self.failUnlessEqual(l.getName(), "compile")
+        self.failUnlessEqual(l.getStep(), 13)
+        l.addHeader("HEADER\n")
+        l.addStdout("Some text\n")
+        l.addStderr("Some error\n")
+        l.addStdout("Some more text\n")
+        self.failUnlessEqual(l.getText(),
+                             "Some text\nSome error\nSome more text\n")
+        self.failUnlessEqual(l.getTextWithHeaders(),
+                             "HEADER\n" +
+                             "Some text\nSome error\nSome more text\n")
+        self.failUnlessEqual(len(l.getChunks()), 4)
+
+    def testMerge(self):
+        l = builder.LogFile(None)
+        l.addHeader("HEADER\n")
+        l.addStdout("Some text\n")
+        l.addStdout("Some more text\n")
+        l.addStdout("more\n")
+        self.failUnlessEqual(l.getText(),
+                             "Some text\nSome more text\nmore\n")
+        self.failUnlessEqual(l.getTextWithHeaders(),
+                             "HEADER\n" +
+                             "Some text\nSome more text\nmore\n")
+        self.failUnlessEqual(len(l.getChunks()), 2)
+
+    def testStubify(self):
+        l = builder.LogFile(None)
+        l.name = "compile"
+        l.step = 13
+        l.addHeader("HEADER\n")
+        l.addStdout("Some text\n")
+        l.addStdout("Some more text\n")
+        l.addStdout("more\n")
+        stub = l.stubify()
+        self.failUnless(components.implements(stub,
+                                              interfaces.IStatusLogStub))
+        self.failUnlessEqual(stub.getName(), l.getName())
+        self.failUnlessEqual(stub.getStep(), l.getStep())




From warner at users.sourceforge.net  Thu Nov 11 19:31:18 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 19:31:18 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.305,1.306
Message-ID: <E1CSKf8-0006fE-OE@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): Merge string
chunks together, up to 10kb per chunk. This ought to cut down on
the CPU-burning overhead of large log files. Thanks to Alexander
Staubo for spotting the problem.
* buildbot/test/test_status.py (Log): tests for same


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.305
retrieving revision 1.306
diff -u -d -r1.305 -r1.306
--- ChangeLog	11 Nov 2004 00:43:49 -0000	1.305
+++ ChangeLog	11 Nov 2004 19:31:15 -0000	1.306
@@ -1,3 +1,11 @@
+2004-11-11  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (LogFile.addEntry): Merge string
+	chunks together, up to 10kb per chunk. This ought to cut down on
+	the CPU-burning overhead of large log files. Thanks to Alexander
+	Staubo for spotting the problem.
+	* buildbot/test/test_status.py (Log): tests for same
+
 2004-11-10  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date




From warner at users.sourceforge.net  Thu Nov 11 20:47:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 20:47:17 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py,1.41,1.42
Message-ID: <E1CSLqg-0002bI-2e@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): smarter way to do it: one
string merge per chunk. There are now separate .entries and .runEntries
lists: when enumerating over all chunks, make sure to look at both.
* buildbot/test/test_status.py (Log): more tests


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- builder.py	11 Nov 2004 19:31:15 -0000	1.41
+++ builder.py	11 Nov 2004 20:47:15 -0000	1.42
@@ -77,12 +77,15 @@
     finished = False
     length = 0
     progress = None
+    chunkSize = 10*1000
+    runLength = 0
 
     def __init__(self, parent):
         self.step = parent
         self.watchers = []
         self.finishedWatchers = []
         self.entries = []
+        self.runEntries = []
 
     def getName(self):
         return self.name # set in BuildStepStatus.addLog
@@ -101,16 +104,17 @@
         return d
 
     def getText(self):
-        return "".join([e[1] for e in self.entries if e[0] in (STDOUT,STDERR)])
+        return "".join([e[1] for e in self.entries + self.runEntries
+                        if e[0] in (STDOUT,STDERR)])
     def getTextWithHeaders(self):
-        return "".join([e[1] for e in self.entries])
+        return "".join([e[1] for e in self.entries + self.runEntries])
     def getChunks(self):
-        return self.entries
+        return self.entries + self.runEntries
 
     def subscribe(self, receiver, catchup):
         self.watchers.append(receiver)
         if catchup:
-            for channel, text in self.entries:
+            for channel, text in self.entries + self.runEntries:
                 # TODO: add logChunks(), to send over everything at once?
                 receiver.logChunk(self.step.build, self.step, self,
                                   channel, text)
@@ -123,17 +127,28 @@
         self.progress = progress
         self.progressName = name
 
+    def merge(self):
+        # merge all .runEntries (which are all of the same type) into a
+        # single chunk for .entries
+        if not self.runEntries:
+            return
+        channel = self.runEntries[0][0]
+        text = "".join([c[1] for c in self.runEntries])
+        self.entries.append((channel, text))
+        self.runEntries = []
+        self.runLength = 0
+
     def addEntry(self, channel, text):
         assert not self.finished
-        if (self.entries
-            and channel == self.entries[-1][0]
-            and len(self.entries[-1][1]) < 10000):
-            # merge same-category chunks together, up to 10kb each, to cut
-            # down on overhead when assembling these into a single big string
-            # later.
-            self.entries[-1] = (channel, self.entries[-1][1] + text)
-        else:
-            self.entries.append((channel, text))
+        # we only add to .runEntries here. merge() is responsible for adding
+        # merged chunks to .entries
+        if self.runEntries and channel != self.runEntries[0][0]:
+            self.merge()
+        self.runEntries.append((channel, text))
+        self.runLength += len(text)
+        if self.runLength > self.chunkSize:
+            self.merge()
+
         for w in self.watchers:
             w.logChunk(self.step.build, self.step, self, channel, text)
         self.length += len(text)
@@ -148,6 +163,7 @@
         self.addEntry(HEADER, text)
 
     def finish(self):
+        self.merge()
         self.finished = True
         watchers = self.finishedWatchers
         self.finishedWatchers = []




From warner at users.sourceforge.net  Thu Nov 11 20:47:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 20:47:17 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_status.py,1.12,1.13
Message-ID: <E1CSLqg-0002bE-0s@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	test_status.py 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): smarter way to do it: one
string merge per chunk. There are now separate .entries and .runEntries
lists: when enumerating over all chunks, make sure to look at both.
* buildbot/test/test_status.py (Log): more tests


Index: test_status.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_status.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- test_status.py	11 Nov 2004 19:31:06 -0000	1.12
+++ test_status.py	11 Nov 2004 20:47:14 -0000	1.13
@@ -247,6 +247,9 @@
         l.addStdout("Some text\n")
         l.addStderr("Some error\n")
         l.addStdout("Some more text\n")
+        self.failIf(l.isFinished())
+        l.finish()
+        self.failUnless(l.isFinished())
         self.failUnlessEqual(l.getText(),
                              "Some text\nSome error\nSome more text\n")
         self.failUnlessEqual(l.getTextWithHeaders(),
@@ -260,6 +263,7 @@
         l.addStdout("Some text\n")
         l.addStdout("Some more text\n")
         l.addStdout("more\n")
+        l.finish()
         self.failUnlessEqual(l.getText(),
                              "Some text\nSome more text\nmore\n")
         self.failUnlessEqual(l.getTextWithHeaders(),
@@ -267,6 +271,22 @@
                              "Some text\nSome more text\nmore\n")
         self.failUnlessEqual(len(l.getChunks()), 2)
 
+    def testMerge2(self):
+        l = builder.LogFile(None)
+        l.addHeader("HEADER\n")
+        for i in xrange(1000):
+            l.addStdout("aaaa")
+        for i in xrange(30):
+            l.addStderr("bbbb")
+        for i in xrange(10):
+            l.addStdout("cc")
+        self.failUnlessEqual(l.getText(),
+                             1000*"aaaa" + 30 * "bbbb" + 10 * "cc")
+        l.finish()
+        self.failUnlessEqual(l.getText(),
+                             1000*"aaaa" + 30 * "bbbb" + 10 * "cc")
+        self.failUnlessEqual(len(l.getChunks()), 4)
+
     def testStubify(self):
         l = builder.LogFile(None)
         l.name = "compile"




From warner at users.sourceforge.net  Thu Nov 11 20:47:18 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 20:47:18 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.306,1.307
Message-ID: <E1CSLqg-0002bY-Ik@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
* buildbot/status/builder.py (LogFile.addEntry): smarter way to do it: one
string merge per chunk. There are now separate .entries and .runEntries
lists: when enumerating over all chunks, make sure to look at both.
* buildbot/test/test_status.py (Log): more tests


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.306
retrieving revision 1.307
diff -u -d -r1.306 -r1.307
--- ChangeLog	11 Nov 2004 19:31:15 -0000	1.306
+++ ChangeLog	11 Nov 2004 20:47:15 -0000	1.307
@@ -1,5 +1,11 @@
 2004-11-11  Brian Warner  <warner at lothar.com>
 
+	* buildbot/status/builder.py (LogFile.addEntry): smarter way to do
+	it: one string merge per chunk. There are now separate .entries
+	and .runEntries lists: when enumerating over all chunks, make sure
+	to look at both.
+	* buildbot/test/test_status.py (Log): more tests
+
 	* buildbot/status/builder.py (LogFile.addEntry): Merge string
 	chunks together, up to 10kb per chunk. This ought to cut down on
 	the CPU-burning overhead of large log files. Thanks to Alexander




From warner at users.sourceforge.net  Thu Nov 11 20:50:25 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 11 Nov 2004 20:50:25 +0000
Subject: [Buildbot-commits] CVSROOT syncmail.conf,1.1,1.2
Message-ID: <E1CSLti-0002mh-As@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	syncmail.conf 
Log Message:
set verbose=false, to hush the (now-hopefully-unnecessary) messages during
commit


Index: syncmail.conf
===================================================================
RCS file: /cvsroot/buildbot/CVSROOT/syncmail.conf,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- syncmail.conf	23 Sep 2004 14:35:49 -0000	1.1
+++ syncmail.conf	11 Nov 2004 20:50:23 -0000	1.2
@@ -7,7 +7,7 @@
 
 [general]
 ; miscellaneous
-verbose        = true
+verbose        = false
 email          = true
 
 ; the kind of diff we generate




From warner at users.sourceforge.net  Fri Nov 12 22:36:41 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Fri, 12 Nov 2004 22:36:41 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py,1.42,1.43
Message-ID: <E1CSk25-0007Zc-5l@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
(BuilderStatus.saveYourself): use a safer w32-compatible approach, and only
use it on windows
(BuildStatus.saveYourself): same


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- builder.py	11 Nov 2004 20:47:15 -0000	1.42
+++ builder.py	12 Nov 2004 22:36:38 -0000	1.43
@@ -5,7 +5,7 @@
 from twisted.python import log, components
 from twisted.internet import reactor, defer
 
-import time, os.path, shutil
+import time, os.path, shutil, sys
 try:
     import cPickle as pickle
 except ImportError:
@@ -781,13 +781,14 @@
         tmpfilename = filename + ".tmp"
         try:
             pickle.dump(self, open(tmpfilename, "w"), -1)
-            try:
-                os.rename(tmpfilename, filename)
-            except OSError:
-                # windows cannot rename a file on top of an existing one
+            if sys.platform == 'win32':
+                # windows cannot rename a file on top of an existing one, so
+                # fall back to delete-first. There are ways this can fail and
+                # lose the builder's history, so we avoid using it in the
+                # general (non-windows) case
                 os.unlink(filename)
-                os.rename(tmpfilename, filename)
-        except Exception, e:
+            os.rename(tmpfilename, filename)
+        except:
             log.msg("unable to save build %s-#%d" % (self.builder.name,
                                                      self.number))
             log.err()
@@ -872,13 +873,11 @@
         tmpfilename = filename + ".tmp"
         try:
             pickle.dump(self, open(tmpfilename, "w"), -1)
-            try:
-                os.rename(tmpfilename, filename)
-            except OSError:
+            if sys.platform == 'win32':
                 # windows cannot rename a file on top of an existing one
                 os.unlink(filename)
-                os.rename(tmpfilename, filename)
-        except Exception, e:
+            os.rename(tmpfilename, filename)
+        except:
             log.msg("unable to save builder %s" % self.name)
             log.err()
         




From warner at users.sourceforge.net  Fri Nov 12 22:36:41 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Fri, 12 Nov 2004 22:36:41 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.307,1.308
Message-ID: <E1CSk25-0007Zf-FT@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(BuilderStatus.saveYourself): use a safer w32-compatible approach, and only
use it on windows
(BuildStatus.saveYourself): same


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.307
retrieving revision 1.308
diff -u -d -r1.307 -r1.308
--- ChangeLog	11 Nov 2004 20:47:15 -0000	1.307
+++ ChangeLog	12 Nov 2004 22:36:39 -0000	1.308
@@ -1,3 +1,9 @@
+2004-11-12  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (BuilderStatus.saveYourself): use a
+	safer w32-compatible approach, and only use it on windows
+	(BuildStatus.saveYourself): same
+
 2004-11-11  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/builder.py (LogFile.addEntry): smarter way to do




From warner at users.sourceforge.net  Mon Nov 15 09:26:32 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 15 Nov 2004 09:26:32 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process process_twisted.py,1.34,1.35
Message-ID: <E1CTd84-0003OW-AG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	process_twisted.py 
Log Message:
(QuickTwistedBuildFactory): try to teach the Quick factory to use multiple
versions of python


Index: process_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/process_twisted.py,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- process_twisted.py	12 Sep 2004 06:42:39 -0000	1.34
+++ process_twisted.py	15 Nov 2004 09:26:29 -0000	1.35
@@ -40,15 +40,19 @@
     useProgress = 0
 
     def __init__(self, svnurl, python="python"):
+        if type(python) is str:
+            python = [python]
         self.steps = []
         self.steps.append(s(step.SVN, svnurl=svnurl, mode=self.mode))
-        self.steps.append(s(HLint, python=python))
-        cmd = "%s setup.py build_ext -i" % python
-        self.steps.append(s(step.Compile, command=cmd, flunkOnFailure=True))
+        self.steps.append(s(HLint, python=python[0]))
         self.steps.append(s(RemovePYCs))
-        self.steps.append(s(TwistedTrial,
-                            python=python, # can be a list
-                            testChanges=True))
+        for p in python:
+            cmd = "%s setup.py build_ext -i" % p
+            self.steps.append(s(step.Compile, command=cmd,
+                                flunkOnFailure=True))
+            self.steps.append(s(TwistedTrial,
+                                python=p, # can be a list
+                                testChanges=True))
 
 class FullTwistedBuildFactory(TwistedBaseFactory):
     treeStableTimer = 5*60




From warner at users.sourceforge.net  Mon Nov 15 09:26:32 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Mon, 15 Nov 2004 09:26:32 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.308,1.309
Message-ID: <E1CTd84-0003Oc-TT@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(QuickTwistedBuildFactory): try to teach the Quick factory to use multiple
versions of python


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.308
retrieving revision 1.309
diff -u -d -r1.308 -r1.309
--- ChangeLog	12 Nov 2004 22:36:39 -0000	1.308
+++ ChangeLog	15 Nov 2004 09:26:30 -0000	1.309
@@ -1,3 +1,8 @@
+2004-11-15  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/process_twisted.py (QuickTwistedBuildFactory):
+	try to teach the Quick factory to use multiple versions of python
+
 2004-11-12  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/builder.py (BuilderStatus.saveYourself): use a




From warner at users.sourceforge.net  Tue Nov 23 01:13:56 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:13:56 +0000
Subject: [Buildbot-commits] buildbot/docs factories.xhtml,1.5,1.6
Message-ID: <E1CWPFk-000494-Mb@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	factories.xhtml 
Log Message:
* buildbot/process/step_twisted.py (Trial): update docs a bit

* docs/factories.xhtml: fix Trial factory docs to match reality.
Closes: SF#1049758.

* buildbot/process/factory.py (Trial.__init__): add args for
randomly= and recurse=, making them available to instantiators
instead of only to subclassers. Closes: SF#1049759.


Index: factories.xhtml
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/factories.xhtml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- factories.xhtml	30 Aug 2004 08:40:31 -0000	1.5
+++ factories.xhtml	23 Nov 2004 01:13:53 -0000	1.6
@@ -306,10 +306,15 @@
 
 <p>Unfortunately, the <q>build/lib</q> directory into which the built/copied
 .py files are placed is actually architecture-dependent, and I do not yet
-know of a simple way to calculate its value. In addition, the
-<q>PROJECTNAME</q> value is project-dependent: it is usually just the
-project's top-level library directory, as common practice suggests the unit
-test files are put in the <q>test</q> sub-module.</p>
+know of a simple way to calculate its value. For many projects it is
+sufficient to import their libraries <q>in place</q> from the tree's base
+directory (<code>PYTHONPATH=.</code>).</p>
+
+<p>In addition, the <q>PROJECTNAME</q> value where the test files are
+located is project-dependent: it is usually just the project's top-level
+library directory, as common practice suggests the unit test files are put
+in the <q>test</q> sub-module. This value cannot be guessed, the
+<code>Trial</code> class must be told where to find the test files.</p>
 
 <p>The <code>Trial</code> class provides support for building and testing
 projects which use distutils and trial. If the test module name is
@@ -333,37 +338,107 @@
   <li><code>source</code> (required): A step specification tuple, that that
   used by GNUAutoconf.</li>
   
-  <li><code>python</code>: A string which specifies the <q>python</q>
-  executable to use. Defaults to just <q>python</q>.</li>
+  <li><code>buildpython</code>: A list (argv array) of strings which
+  specifies the <q>python</q> executable to use when building the package.
+  Defaults to just <code>['python']</code>. It may be useful to add flags
+  here, to supress warnings during compilation of extension modules. This
+  list is extended with <code>['./setup.py', 'build']</code> and then
+  executed in a ShellCommand.</li>
 
-  <li><code>trialModule</code>: Provides a module name which contains the
-  unit tests for this project. Accepts a string, typically
-  <code>PROJECTNAME.test</code>, or a list of strings. Defaults to None,
-  indicating that no tests should be run.</li>
+  <li><code>testpath</code>: Provides a directory to add to
+  <code>PYTHONPATH</code> when running the unit tests, if tests are being
+  run. Defaults to <code>.</code> to include the project files in-place. The
+  generated build library is frequently architecture-dependent, but may
+  simply be <q>build/lib</q> for pure-python modules.</li>
+
+  <li><code>trialpython</code>: Another list of strings used to build the
+  command that actually runs trial. This is prepended to the contents of the
+  <code>trial</code> argument below. It may be useful to add <q>-W</q> flags
+  here to supress warnings that occur while tests are being run. Defaults to
+  an empty list, meaning <code>trial</code> will be run without an explicit
+  interpreter, which is generally what you want if you're using
+  /usr/bin/trial instead of, say, the ./bin/trial that lives in the Twisted
+  source tree.</li>
 
   <li><code>trial</code>: provides the name of the <q>trial</q> command. It
   is occasionally useful to use an alternate executable, such as
   <q>trial2.2</q> which might run the tests under an older version of
   Python. Defaults to <q>trial</q>.</li>
-  
-  <li><code>testPath</code>: Provides a directory to add to
-  <code>PYTHONPATH</code> when running the unit tests, if tests are being
-  run. Defaults to <code>.</code> to include the project files in-place. The
-  generated build library is frequently architecture-dependent, but may
-  simply be <q>build/lib</q> for pure-python modules.</li>
 
-  <li><code>trialArgs</code>: Provides a list of additional arguments to
-  give to trial. <code>["--reactor", "gtk2"]</code> would use an alternate
-  reactor, <code>["--random", "0"]</code> would run the tests in a random
-  order each time. Defaults to an empty list.</li>
+  <li><code>tests</code>: Provides a module name or names which contain the
+  unit tests for this project. Accepts a string, typically
+  <code>PROJECTNAME.test</code>, or a list of strings. Defaults to None,
+  indicating that no tests should be run. You must either set this or
+  <code>useTestCaseNames</code> to do anyting useful with the Trial
+  factory.</li>
 
   <li><code>useTestCaseNames</code>: Tells the Step to provide the names of
   all changed .py files to trial, so it can look for test-case-name tags and
   run just the matching test cases. Suitable for use in quick builds.
   Defaults to False.</li>
+
+  <li><code>randomly</code>: If <q>True</q>, tells Trial (with the
+  <code>--random=0</code> argument) to run the test cases in random order,
+  which sometimes catches subtle inter-test dependency bugs. Defaults to
+  <q>False</q>.</li>
+
+  <li><code>recurse</code>: If <q>True</q>, tells Trial (with the
+  <code>--recurse</code> argument) to look in all subdirectories for
+  additional test cases. It isn't clear to me how this works, but it may be
+  useful to deal with the unknown-PROJECTNAME problem described above, and
+  is currently used in the Twisted buildbot to accomodate the fact that test
+  cases are now distributed through multiple twisted.SUBPROJECT.test
+  directories.</li>
+  
 </ul>
 
 <p>Unless one of <code>trialModule</code> or <code>useTestCaseNames</code>
 are set, no tests will be run.</p>
 
+<p>Some quick examples follow. Most of these examples assume that the target
+python code (the <q>code under test</q>) can be reached directly from the
+root of the target tree, rather than being in a lib/ subdirectory.</p>
+
+<pre>
+#  Trial(source, tests="toplevel.test") does:
+#   python ./setup.py build
+#   PYTHONPATH=. trial -to toplevel.test
+
+#  Trial(source, tests=["toplevel.test", "other.test"]) does:
+#   python ./setup.py build
+#   PYTHONPATH=. trial -to toplevel.test other.test
+
+#  Trial(source, useTestCaseNames=True) does:
+#   python ./setup.py build
+#   PYTHONPATH=. trial -to --testmodule=foo/bar.py..  (from Changes)
+
+#  Trial(source, buildpython=["python2.3", "-Wall"], tests="foo.tests") does:
+#   python2.3 -Wall ./setup.py build
+#   PYTHONPATH=. trial -to foo.tests
+
+#  Trial(source, trialpython="python2.3", trial="/usr/bin/trial",
+#        tests="foo.tests") does:
+#   python2.3 -Wall ./setup.py build
+#   PYTHONPATH=. python2.3 /usr/bin/trial -to foo.tests
+
+# For running trial out of the tree being tested (only useful when the tree
+# being built is Twisted itself):
+#  Trial(source, trialpython=["python2.3", "-Wall"], trial="./bin/trial",
+#        tests="foo.tests") does:
+#   python2.3 -Wall ./setup.py build
+#   PYTHONPATH=. python2.3 -Wall ./bin/trial -to foo.tests
+</pre>
+
+<p>If the output directory of <q>./setup.py build</q> is known, you can pull
+the python code from the built location instead of the source directories.
+This should be able to handle variations in where the source comes from, as
+well as accomodating binary extension modules:</p>
+
+<pre>
+# Trial(source, tests="toplevel.test", testpath='build/lib.linux-i686-2.3')
+# does:
+#  python ./setup.py build
+#  PYTHONPATH=build/lib.linux-i686-2.3 trial -to toplevel.test
+</pre>
+
 </body> </html>




From warner at users.sourceforge.net  Tue Nov 23 01:13:57 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:13:57 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.309,1.310
Message-ID: <E1CWPFm-00049D-61@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
* buildbot/process/step_twisted.py (Trial): update docs a bit

* docs/factories.xhtml: fix Trial factory docs to match reality.
Closes: SF#1049758.

* buildbot/process/factory.py (Trial.__init__): add args for
randomly= and recurse=, making them available to instantiators
instead of only to subclassers. Closes: SF#1049759.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.309
retrieving revision 1.310
diff -u -d -r1.309 -r1.310
--- ChangeLog	15 Nov 2004 09:26:30 -0000	1.309
+++ ChangeLog	23 Nov 2004 01:13:55 -0000	1.310
@@ -1,3 +1,14 @@
+2004-11-22  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/step_twisted.py (Trial): update docs a bit
+
+	* docs/factories.xhtml: fix Trial factory docs to match reality.
+	Closes: SF#1049758.
+
+	* buildbot/process/factory.py (Trial.__init__): add args for
+	randomly= and recurse=, making them available to instantiators
+	instead of only to subclassers. Closes: SF#1049759.
+
 2004-11-15  Brian Warner  <warner at lothar.com>
 
 	* buildbot/process/process_twisted.py (QuickTwistedBuildFactory):




From warner at users.sourceforge.net  Tue Nov 23 01:13:57 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:13:57 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process step_twisted.py,1.62,1.63 factory.py,1.5,1.6
Message-ID: <E1CWPFm-00049B-B1@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	step_twisted.py factory.py 
Log Message:
* buildbot/process/step_twisted.py (Trial): update docs a bit

* docs/factories.xhtml: fix Trial factory docs to match reality.
Closes: SF#1049758.

* buildbot/process/factory.py (Trial.__init__): add args for
randomly= and recurse=, making them available to instantiators
instead of only to subclassers. Closes: SF#1049759.


Index: factory.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/factory.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- factory.py	15 Sep 2004 08:54:29 -0000	1.5
+++ factory.py	23 Nov 2004 01:13:55 -0000	1.6
@@ -88,19 +88,30 @@
     """Build a python module that uses distutils and trial. Set 'tests' to
     the module in which the tests can be found, or set useTestCaseNames=True
     to always have trial figure out which tests to run (based upon which
-    files have been changed)."""
+    files have been changed).
+
+    See docs/factories.xhtml for usage samples. Not all of the Trial
+    BuildStep options are available here, only the most commonly used ones.
+    To get complete access, you will need to create a custom
+    BuildFactory."""
 
     trial = "trial"
     randomly = False
     recurse = False
 
     def __init__(self, source,
-                 buildpython=["python"], trialpython=[],
-                 testpath=".",
+                 buildpython=["python"], trialpython=[], trial=None
+                 testpath=".", randomly=None, recurse=None,
                  tests=None,  useTestCaseNames=False, env=None):
         assert type(source) is tuple
         assert issubclass(source[0], step.BuildStep)
         assert tests or useTestCaseNames, "must use one or the other"
+        if trial is not None:
+            self.trial = trial
+        if randomly is not None:
+            self.randomly = randomly
+        if recurse is not None:
+            self.recurse = recurse
 
         from buildbot.process import step_twisted
         self.steps = []
@@ -115,33 +126,6 @@
                             recurse=self.recurse,
                             env=env,
                             ))
-# examples: (TODO: move these into the docs)
-
-#  Trial(source, tests="toplevel.test") does:
-#   python ./setup.py build
-#   PYTHONPATH=. trial -to toplevel.test
-
-#  Trial(source, tests=["toplevel.test", "other.test"]) does:
-#   python ./setup.py build
-#   PYTHONPATH=. trial -to toplevel.test other.test
-
-#  Trial(source, useTestCaseNames) does:
-#   python ./setup.py build
-#   PYTHONPATH=. trial -to --testmodule=foo/bar.py..  (from Changes)
-
-#  Trial(source, buildpython=["python2.3", "-Wall"], tests="foo.tests") does:
-#   python2.3 -Wall ./setup.py build
-#   PYTHONPATH=. trial -to foo.tests
-
-#  Trial(source, trialpython="python2.3", trial="/usr/bin/trial",
-#        tests="foo.tests") does:
-#   python2.3 -Wall ./setup.py build
-#   PYTHONPATH=. python2.3 /usr/bin/trial -to foo.tests
-
-#  Trial(source, trialpython=["python2.3", "-Wall"], trial="./bin/trial",
-#        tests="foo.tests") does:
-#   python2.3 -Wall ./setup.py build
-#   PYTHONPATH=. python2.3 -Wall ./bin/trial -to foo.tests
 
 
 # compatibility classes, will go away. Note that these only offer

Index: step_twisted.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/step_twisted.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- step_twisted.py	8 Nov 2004 09:50:17 -0000	1.62
+++ step_twisted.py	23 Nov 2004 01:13:54 -0000	1.63
@@ -196,6 +196,10 @@
     the master where it can be seen as part of the status output.
 
 
+    @param testpath: a string to use in PYTHONPATH when running the tests. If
+     None, do not set PYTHONPATH. Setting this to '.' will cause the source
+     files to be used in-place.
+
     @param python: which python executable to use. Must be a string (without
      spaces) or a list, and will form the start of the argv array that will
      launch trial. If you use this, you should set 'trial' to an explicit
@@ -209,10 +213,6 @@
      you set 'python', this should be set to an explicit path (because
      'python2.3 trial' will not work).
 
-    @param testpath: a string to use in PYTHONPATH when running the tests. If
-     None, do not set PYTHONPATH. Setting this to '.' will cause the source
-     files to be used in-place.
-
     @param tests: a list of test modules to run, like
      ['twisted.test.test_defer', 'twisted.test.test_process']. If this is
      a string, it will be converted into a one-item list.
@@ -240,6 +240,10 @@
     may be useful to set: workdir, haltOnFailure, flunkOnWarnings,
     flunkOnFailure, warnOnWarnings, warnOnFailure, want_stdout, want_stderr,
     timeout.
+
+    Also, there are some class attributes which may be usefully overridden
+    by subclasses. 'trialMode' and 'trialArgs' can influence the trial
+    command line.
     """
 
     flunkOnFailure = True




From warner at users.sourceforge.net  Tue Nov 23 01:18:16 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:18:16 +0000
Subject: [Buildbot-commits] buildbot/docs changes.xhtml,1.1,1.2
Message-ID: <E1CWPJx-0004My-Ii@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	changes.xhtml 
Log Message:
(FreshCVSSourceNewcred): fix typo. Closes SF#1042563.


Index: changes.xhtml
===================================================================
RCS file: /cvsroot/buildbot/buildbot/docs/changes.xhtml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- changes.xhtml	30 Aug 2004 01:34:35 -0000	1.1
+++ changes.xhtml	23 Nov 2004 01:18:13 -0000	1.2
@@ -35,7 +35,7 @@
 <pre class="python">
 s = FreshCVSSourceNewcred(host="host", port=4519,
                           user="alice", passwd="secret",
-                          prefix="Twisted"0
+                          prefix="Twisted")
 BuildmasterConfig['sources'] = [s]
 </pre>
 




From warner at users.sourceforge.net  Tue Nov 23 01:18:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:18:17 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.310,1.311
Message-ID: <E1CWPJy-0004N4-0o@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(FreshCVSSourceNewcred): fix typo. Closes SF#1042563.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.310
retrieving revision 1.311
diff -u -d -r1.310 -r1.311
--- ChangeLog	23 Nov 2004 01:13:55 -0000	1.310
+++ ChangeLog	23 Nov 2004 01:18:14 -0000	1.311
@@ -1,5 +1,8 @@
 2004-11-22  Brian Warner  <warner at lothar.com>
 
+	* docs/changes.xhtml (FreshCVSSourceNewcred): fix typo. Closes
+	SF#1042563.
+
 	* buildbot/process/step_twisted.py (Trial): update docs a bit
 
 	* docs/factories.xhtml: fix Trial factory docs to match reality.




From warner at users.sourceforge.net  Tue Nov 23 01:24:33 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:24:33 +0000
Subject: [Buildbot-commits] buildbot README,1.21,1.22 ChangeLog,1.311,1.312
Message-ID: <E1CWPQ2-0004kb-HC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	README ChangeLog 
Log Message:
(SLAVE): fix usage of 'buildbot slave' command. Thanks to Yoz Grahame.
Closes SF#1050138.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.311
retrieving revision 1.312
diff -u -d -r1.311 -r1.312
--- ChangeLog	23 Nov 2004 01:18:14 -0000	1.311
+++ ChangeLog	23 Nov 2004 01:24:30 -0000	1.312
@@ -1,5 +1,8 @@
 2004-11-22  Brian Warner  <warner at lothar.com>
 
+	* README (SLAVE): fix usage of 'buildbot slave' command. Thanks to
+	Yoz Grahame. Closes SF#1050138.
+
 	* docs/changes.xhtml (FreshCVSSourceNewcred): fix typo. Closes
 	SF#1042563.
 

Index: README
===================================================================
RCS file: /cvsroot/buildbot/buildbot/README,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- README	1 Oct 2004 03:18:12 -0000	1.21
+++ README	23 Nov 2004 01:24:30 -0000	1.22
@@ -122,7 +122,7 @@
 
 Now run the 'buildbot' command as follows:
 
- buildbot slave --basedir WORKDIR --master HOST:PORT --name NAME --passwd PWD
+ buildbot slave WORKDIR MASTERHOST:PORT SLAVENAME PASSWORD
 
 This will create a "TAP" file called "buildbot.tap", which bundles up all
 the state needed by the build slave application. Twisted has a tool called




From warner at users.sourceforge.net  Tue Nov 23 01:52:43 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 01:52:43 +0000
Subject: [Buildbot-commits] buildbot NEWS,1.31,1.32 ChangeLog,1.312,1.313
Message-ID: <E1CWPrI-0006D3-4i@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	NEWS ChangeLog 
Log Message:
summarize updates since last release


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.312
retrieving revision 1.313
diff -u -d -r1.312 -r1.313
--- ChangeLog	23 Nov 2004 01:24:30 -0000	1.312
+++ ChangeLog	23 Nov 2004 01:52:41 -0000	1.313
@@ -1,5 +1,7 @@
 2004-11-22  Brian Warner  <warner at lothar.com>
 
+	* NEWS: summarize updates since last release
+
 	* README (SLAVE): fix usage of 'buildbot slave' command. Thanks to
 	Yoz Grahame. Closes SF#1050138.
 

Index: NEWS
===================================================================
RCS file: /cvsroot/buildbot/buildbot/NEWS,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- NEWS	1 Oct 2004 02:12:26 -0000	1.31
+++ NEWS	23 Nov 2004 01:52:41 -0000	1.32
@@ -1,5 +1,98 @@
 User visible changes in Buildbot.
 
+* Release 0.6.1 (?)
+
+** win32 improvements/bugfixes
+
+Several changes have gone in to improve portability to non-unix systems. It
+should be possible to run a build slave under windows without major issues
+(although step-by-step documentation is still greatly desired: check the
+mailing list for suggestions from current win32 users).
+
+*** PBChangeSource: use configurable directory separator, not os.sep
+
+The PBChangeSource, which listens on a TCP socket for change notices
+delivered from tools like contrib/svn_buildbot.py, was splitting source
+filenames with os.sep . This is inappropriate, because those file names are
+coming from the VC repository, not the local filesystem, and the repository
+host may be running a different OS (with a different separator convention)
+than the buildmaster host. In particular, a win32 buildmaster using a CVS
+repository running on a unix box would be confused.
+
+PBChangeSource now takes a sep= argument to indicate the separator character
+to use.
+
+*** build saving should work better
+
+windows cannot do the atomic os.rename() trick that unix can, so under win32
+the buildmaster falls back to save/delete-old/rename, which carries a slight
+risk of losing a saved build log (if the system were to crash between the
+delete-old and the rename).
+
+** new features
+
+*** test-result tracking
+
+Work has begun on fine-grained test-result handling. The eventual goal is to
+be able to track individual tests over time, and create problem reports when
+a test starts failing (which then are resolved when the test starts passing
+again). The first step towards this is an ITestResult interface, and code in
+the TrialTestParser to create such results for all non-passing tests (the
+ones for which Trial emits exception tracebacks).
+
+These test results are currently displayed in a tree-like display in a page
+accessible from each Build's page (follow the numbered link in the yellow
+box at the start of each build to get there).
+
+This interface is still in flux, as it really wants to be able to accomodate
+things like compiler warnings and tests that are skipped because of missing
+libraries or unsupported architectures.
+
+** bug fixes
+
+*** VC updates should survive temporary failures
+
+Some VC systems (CVS and SVN in particular) get upset when files are turned
+into directories or vice versa, or when repository items are moved without
+the knowledge of the VC system. The usual symptom is that a 'cvs update'
+fails where a fresh checkout succeeds.
+
+To avoid having to manually intervene, the build slaves' VC commands have
+been refactored to respond to update failures by deleting the tree and
+attempting a full checkout. This may cause some unnecessary effort when,
+e.g., the CVS server falls off the net, but in the normal case it will only
+come into play when one of these can't-cope situations arises.
+
+*** forget about an existing build when the slave detaches
+
+If the slave was lost during a build, the master did not clear the
+.currentBuild reference, making that builder unavailable for later builds.
+This has been fixed, so that losing a slave should be handled better. This
+area still needs some work, I think it's still possible to get both the
+slave and the master wedged by breaking the connection at just the right
+time. Eventually I want to be able to resume interrupted builds (especially
+when the interruption is the result of a network failure and not because the
+slave or the master actually died).
+
+*** large logfiles now consume less memory
+
+Build logs are stored as lists of (type,text) chunks, so that
+stdout/stderr/headers can be displayed differently (if they were
+distinguishable when they were generated: stdout and stderr are merged when
+usePTY=1). For multi-megabyte logfiles, a large list with many short strings
+could incur a large overhead. The new behavior is to merge same-type string
+chunks together as they are received, aiming for a chunk size of about 10kb,
+which should bring the overhead down to a more reasonable level.
+
+There remains an issue with actually delivering large logfiles over, say,
+the HTML interface. The string chunks must be merged together into a single
+string before delivery, which causes a spike in the memory usage when the
+logfile is viewed. This can also break twisted.web.distrib -type servers,
+where the underlying PB protocol imposes a 640k limit on the size of
+strings. This will be fixed (with a proper Producer/Consumer scheme) in the
+next release.
+
+
 * Release 0.6.0 (30 Sep 2004)
 
 ** new features




From warner at users.sourceforge.net  Tue Nov 23 03:58:17 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 03:58:17 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status html.py,1.43,1.44
Message-ID: <E1CWRon-0004BN-VS@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	html.py 
Log Message:
add TODO about using a producer to send the logfile less stupidly


Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- html.py	19 Oct 2004 18:31:49 -0000	1.43
+++ html.py	23 Nov 2004 03:58:15 -0000	1.44
@@ -509,6 +509,16 @@
             data += self.htmlHeader(request)
         data += self.content(self.original.getChunks(), asText)
 
+        # TODO: to implement a producer for this:
+        #  Create an object that knows about the LogFile. That object's
+        #  .resumeProducing method should pull text from the LogFile's
+        #  .entries, convert them to HTML, then send them to request.write .
+        #  (remember that .entries may be added while the request is being
+        #  served). When all .entries are consumed, send everything in
+        #  .runEntries (oh and do those all before they get merged into a
+        #  new .entries item). Then attach the request to our .watchers
+        #  method and make sure the LogFile knows about us.
+
         if self.original.finished:
             if not asText:
                 data += self.htmlFooter()




From warner at users.sourceforge.net  Tue Nov 23 04:03:28 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 04:03:28 +0000
Subject: [Buildbot-commits] buildbot/buildbot/process factory.py,1.6,1.7
Message-ID: <E1CWRto-0004U4-Gx@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	factory.py 
Log Message:
oops, fixed syntax error


Index: factory.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/process/factory.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- factory.py	23 Nov 2004 01:13:55 -0000	1.6
+++ factory.py	23 Nov 2004 04:03:25 -0000	1.7
@@ -100,7 +100,7 @@
     recurse = False
 
     def __init__(self, source,
-                 buildpython=["python"], trialpython=[], trial=None
+                 buildpython=["python"], trialpython=[], trial=None,
                  testpath=".", randomly=None, recurse=None,
                  tests=None,  useTestCaseNames=False, env=None):
         assert type(source) is tuple




From warner at users.sourceforge.net  Tue Nov 23 10:51:05 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 10:51:05 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status builder.py,1.43,1.44
Message-ID: <E1CWYGH-0000bg-Sb@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	builder.py 
Log Message:
(LogFile): add .runEntries at the class level to, so old pickled builds can
be displayed ok


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- builder.py	12 Nov 2004 22:36:38 -0000	1.43
+++ builder.py	23 Nov 2004 10:51:03 -0000	1.44
@@ -79,6 +79,7 @@
     progress = None
     chunkSize = 10*1000
     runLength = 0
+    runEntries = [] # provided so old pickled builds will getChunks() ok
 
     def __init__(self, parent):
         self.step = parent




From warner at users.sourceforge.net  Tue Nov 23 10:51:07 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 10:51:07 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.313,1.314
Message-ID: <E1CWYGJ-0000bu-GG@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(LogFile): add .runEntries at the class level to, so old pickled builds can
be displayed ok


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.313
retrieving revision 1.314
diff -u -d -r1.313 -r1.314
--- ChangeLog	23 Nov 2004 01:52:41 -0000	1.313
+++ ChangeLog	23 Nov 2004 10:51:03 -0000	1.314
@@ -1,3 +1,8 @@
+2004-11-23  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (LogFile): add .runEntries at the class
+	level to, so old pickled builds can be displayed ok
+
 2004-11-22  Brian Warner  <warner at lothar.com>
 
 	* NEWS: summarize updates since last release




From warner at users.sourceforge.net  Tue Nov 23 10:55:23 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 10:55:23 +0000
Subject: [Buildbot-commits] buildbot Makefile,1.3,1.4
Message-ID: <E1CWYKS-0000sG-07@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	Makefile 
Log Message:
add test-vc target

Index: Makefile
===================================================================
RCS file: /cvsroot/buildbot/buildbot/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile	1 Oct 2004 02:34:43 -0000	1.3
+++ Makefile	23 Nov 2004 10:55:21 -0000	1.4
@@ -15,6 +15,9 @@
 test:
 	$(PP) trial $(TRIALARGS) $(TEST)
 
+test-vc:
+	$(PP) BUILDBOT_TEST_VC=$(PWD)/.. trial $(TRIALARGS) $(TEST) 
+
 #debuild -uc -us
 
 deb-snapshot:




From warner at users.sourceforge.net  Tue Nov 23 11:18:42 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 11:18:42 +0000
Subject: [Buildbot-commits] buildbot README,1.22,1.23 NEWS,1.32,1.33 MANIFEST.in,1.12,1.13
Message-ID: <E1CWYh1-0002jw-PC@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	README NEWS MANIFEST.in 
Log Message:
* NEWS: update for the 0.6.1 release
* MANIFEST.in: add new files

* README (INSTALLATION): explain how to enable the extra VC tests


Index: MANIFEST.in
===================================================================
RCS file: /cvsroot/buildbot/buildbot/MANIFEST.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- MANIFEST.in	1 Oct 2004 02:45:54 -0000	1.12
+++ MANIFEST.in	23 Nov 2004 11:18:40 -0000	1.13
@@ -7,9 +7,9 @@
 include docs/*.xhtml docs/*.css docs/*.tpl
 include buildbot/plugins.tml
 include buildbot/test/mail/* buildbot/test/subdir/*
-include buildbot/scripts/sample.cfg
+include buildbot/scripts/sample.cfg buildbot/scripts/sample.mk
 
 exclude buildbot/test/test_trial.py
 
-include contrib/*
+include contrib/* contrib/windows/*
 include debian/*

Index: NEWS
===================================================================
RCS file: /cvsroot/buildbot/buildbot/NEWS,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- NEWS	23 Nov 2004 01:52:41 -0000	1.32
+++ NEWS	23 Nov 2004 11:18:40 -0000	1.33
@@ -1,6 +1,6 @@
 User visible changes in Buildbot.
 
-* Release 0.6.1 (?)
+* Release 0.6.1 (23 Nov 2004)
 
 ** win32 improvements/bugfixes
 

Index: README
===================================================================
RCS file: /cvsroot/buildbot/buildbot/README,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- README	23 Nov 2004 01:24:30 -0000	1.22
+++ README	23 Nov 2004 11:18:40 -0000	1.23
@@ -84,10 +84,13 @@
 the installation process, as it will probably be easier to track down the bug
 early.
 
-If you want to test the VC checkout process, you'll need to install a tarball
-of repositories, available from http://buildbot.sf.net/ . Otherwise there are
-about 8 tests which will be skipped (all with names like testSVN and
-testArchHTTP).
+If you want to test the VC checkout process, you'll need to install a
+tarball of repositories, available from http://buildbot.sf.net/ . Otherwise
+there are about 8 tests which will be skipped (all with names like testSVN
+and testArchHTTP). If you unpack this tarball in ~/tmp, it will create
+~/tmp/buildbot-test-vc-1, and you can enable the extra tests with:
+
+ PYTHONPATH=. BUILDBOT_TEST_VC=~/tmp trial -v buildbot.test
 
 
  INSTALLING THE LIBRARIES:




From warner at users.sourceforge.net  Tue Nov 23 11:19:57 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 11:19:57 +0000
Subject: [Buildbot-commits] buildbot/buildbot __init__.py,1.4,1.5
Message-ID: <E1CWYiE-0002sq-3i@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	__init__.py 
Log Message:
(version): Releasing buildbot-0.6.1


Index: __init__.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- __init__.py	12 Oct 2004 17:46:30 -0000	1.4
+++ __init__.py	23 Nov 2004 11:19:55 -0000	1.5
@@ -1,3 +1,3 @@
 #! /usr/bin/python
 
-version = "0.6.0+"
+version = "0.6.1"




From warner at users.sourceforge.net  Tue Nov 23 11:19:58 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 11:19:58 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.314,1.315
Message-ID: <E1CWYiE-0002t0-OY@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(version): Releasing buildbot-0.6.1


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.314
retrieving revision 1.315
diff -u -d -r1.314 -r1.315
--- ChangeLog	23 Nov 2004 10:51:03 -0000	1.314
+++ ChangeLog	23 Nov 2004 11:19:55 -0000	1.315
@@ -1,5 +1,14 @@
 2004-11-23  Brian Warner  <warner at lothar.com>
 
+	* buildbot/__init__.py (version): Releasing buildbot-0.6.1
+
+2004-11-23  Brian Warner  <warner at lothar.com>
+
+	* NEWS: update for the 0.6.1 release
+	* MANIFEST.in: add new files
+
+	* README (INSTALLATION): explain how to enable the extra VC tests
+
 	* buildbot/status/builder.py (LogFile): add .runEntries at the class
 	level to, so old pickled builds can be displayed ok
 




From warner at users.sourceforge.net  Tue Nov 23 11:41:03 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Tue, 23 Nov 2004 11:41:03 +0000
Subject: [Buildbot-commits] site ChangeLog,1.16,1.17 NEWS,1.2,1.3 README,1.11,1.12 index.html,1.29,1.30
Message-ID: <E1CWZ2e-0004G9-Ba@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog NEWS README index.html 
Log Message:
update for 0.6.1 release

Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/site/ChangeLog,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- ChangeLog	1 Oct 2004 03:27:04 -0000	1.16
+++ ChangeLog	23 Nov 2004 11:41:00 -0000	1.17
@@ -1,3 +1,190 @@
+2004-11-23  Brian Warner  <warner at lothar.com>
+
+	* buildbot/__init__.py (version): Releasing buildbot-0.6.1
+
+2004-11-23  Brian Warner  <warner at lothar.com>
+
+	* NEWS: update for the 0.6.1 release
+	* MANIFEST.in: add new files
+
+	* README (INSTALLATION): explain how to enable the extra VC tests
+
+	* buildbot/status/builder.py (LogFile): add .runEntries at the class
+	level to, so old pickled builds can be displayed ok
+
+2004-11-22  Brian Warner  <warner at lothar.com>
+
+	* NEWS: summarize updates since last release
+
+	* README (SLAVE): fix usage of 'buildbot slave' command. Thanks to
+	Yoz Grahame. Closes SF#1050138.
+
+	* docs/changes.xhtml (FreshCVSSourceNewcred): fix typo. Closes
+	SF#1042563.
+
+	* buildbot/process/step_twisted.py (Trial): update docs a bit
+
+	* docs/factories.xhtml: fix Trial factory docs to match reality.
+	Closes: SF#1049758.
+
+	* buildbot/process/factory.py (Trial.__init__): add args for
+	randomly= and recurse=, making them available to instantiators
+	instead of only to subclassers. Closes: SF#1049759.
+
+2004-11-15  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/process_twisted.py (QuickTwistedBuildFactory):
+	try to teach the Quick factory to use multiple versions of python
+
+2004-11-12  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (BuilderStatus.saveYourself): use a
+	safer w32-compatible approach, and only use it on windows
+	(BuildStatus.saveYourself): same
+
+2004-11-11  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (LogFile.addEntry): smarter way to do
+	it: one string merge per chunk. There are now separate .entries
+	and .runEntries lists: when enumerating over all chunks, make sure
+	to look at both.
+	* buildbot/test/test_status.py (Log): more tests
+
+	* buildbot/status/builder.py (LogFile.addEntry): Merge string
+	chunks together, up to 10kb per chunk. This ought to cut down on
+	the CPU-burning overhead of large log files. Thanks to Alexander
+	Staubo for spotting the problem.
+	* buildbot/test/test_status.py (Log): tests for same
+
+2004-11-10  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/mail.py (MailNotifier.buildMessage): add a Date
+	header to outbound mail
+	* buildbot/test/test_status.py (Mail.testBuild1): test for same
+
+2004-11-08  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/builder.py (BuilderStatus.saveYourself): w32
+	can't do os.rename() onto an existing file, so catch the exception
+	and unlink the target file first. This introduces a slight window
+	where the existing file could be lost, but the main failure case
+	(disk full) should still be handled safely.
+	(BuildStatus.saveYourself): same
+
+	* buildbot/changes/pb.py (ChangePerspective): use a configurable
+	separator character instead of os.sep, because the filenames being
+	split here are coming from the VC system, which can have a
+	different pathname convention than the local host. This should
+	help a buildmaster running on windows that uses a CVS repository
+	which runs under unix.
+	* buildbot/changes/mail.py (MaildirSource): same, for all parsers
+
+	* buildbot/process/step_twisted.py (Trial.createSummary): survive
+	when there are no test failures to be parsed
+
+	* buildbot/scripts/runner.py (createMaster): use shutil.copy()
+	instead of the unix-specific os.system("cp"), thanks to Elliot
+	Murphy for this and the other buildbot-vs-windows catches.
+	* buildbot/test/test_maildir.py (MaildirTest.deliverMail): same
+
+	* contrib/windows/buildbot.bat: prefix a '@', apparently to not
+	echo the command as it is run
+
+	* setup.py: install sample.mk too, not just sample.cfg
+	(scripts): install contrib/windows/buildbot.bat on windows
+
+2004-11-07  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/builder.py (Builder._detached): clear the
+	self.currentBuild reference, otherwise the next build will be
+	skipped because we think the Builder is already in use.
+
+	* docs/examples/twisted_master.cfg: update to match current usage
+	on the Twisted buildbot
+
+2004-10-29  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/mail.py (MailNotifier): fix typo in docs
+
+2004-10-28  Brian Warner  <warner at lothar.com>
+
+	* buildbot/slave/commands.py (SourceBase): refactor subclasses to
+	have separate doVCUpdate/doVCFull methods. Catch an update failure
+	and respond by clobbering the source directory and re-trying. This
+	will handle local changes (like replacing a file with a directory)
+	that will cause CVS and SVN updates to fail.
+	* buildbot/test/test_vc.py (SetupMixin.do_vc): test the same
+
+	* buildbot/process/step.py (LoggedRemoteCommand.__repr__): avoid a
+	python-2.4 warning
+
+2004-10-19  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/step_twisted.py (Trial.createSummary): bugfixes
+
+	* buildbot/status/html.py (StatusResourceTestResults): display any
+	TestResults that the Build might have
+	(StatusResourceTestResult): and the logs for each TestResult
+	(StatusResourceBuild): add link from the per-build page
+
+2004-10-15  Brian Warner  <warner at lothar.com>
+
+	* buildbot/process/step_twisted.py (Trial.createSummary): parse
+	the 'problems' portion of stdout, add TestResults to our build
+	* buildbot/test/test_twisted.py (Parse.testParse): test it
+
+	* buildbot/interfaces.py (IBuildStatus.getTestResults): new method
+	to retrieve a dict of accumulated test results
+	(ITestResult): define what a single test result can do
+	* buildbot/status/builder.py (TestResult): implement ITestResult
+	(BuildStatus.getTestResults): retrieve dict of TestResults
+	(BuildStatus.addTestResult): add TestResults
+	* buildbot/test/test_status.py (Results.testAddResults): test it
+
+2004-10-14  Brian Warner  <warner at lothar.com>
+
+	* buildbot/test/test_maildir.py (MaildirTest): use shutil.rmtree
+	instead of os.system("rm -rf") for win32 portability
+
+	* buildbot/test/test_slavecommand.py (SlaveCommandTestCase): use
+	SignalMixin instead of starting/stopping the reactor, which is
+	likely to cause problems with other tests
+
+	* buildbot/slave/commands.py (SourceBase.doCopy): remove leftover
+	self.copyComplete() call. Yoz Grahame makes the catch.
+
+	* contrib/windows/buildbot.bat: helper script to deal with path
+	issues. Thanks to Yoz Grahame.
+
+	* buildbot/master.py (BuildMaster.startService): don't register a
+	SIGHUP handler if the signal module has no SIGHUP attribute.
+	Apparently win32 does this.
+
+	* buildbot/scripts/runner.py (start): add --reactor=win32 on win32
+
+	* buildbot/test/test_web.py (WebTest.test_webPathname): skip the
+	test if the reactor can't offer UNIX sockets
+
+	* buildbot/status/html.py (StatusResourceBuild.body): fix syntax
+	error introduced in the last commit. We really need that
+	metabuildbot :).
+
+2004-10-12  Brian Warner  <warner at lothar.com>
+
+	* buildbot/changes/mail.py (MaildirSource.describe): fix exception
+	when describing a maildir source. Thanks to Stephen Davis.
+
+	* buildbot/status/words.py (IrcStatusBot.command_WATCH): round off
+	ETA seconds
+
+	* buildbot/scripts/runner.py (createMaster): install Makefile too
+	(start): add --no_save to 'start' command
+	* buildbot/scripts/sample.mk: simple convenience Makefile with 
+	start/stop/reload targets
+
+	* buildbot/__init__.py (version): bump to 0.6.0+ while between
+	releases
+
 2004-09-30  Brian Warner  <warner at lothar.com>
 
 	* setup.py: Releasing buildbot-0.6.0

Index: NEWS
===================================================================
RCS file: /cvsroot/buildbot/site/NEWS,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- NEWS	1 Oct 2004 03:27:04 -0000	1.2
+++ NEWS	23 Nov 2004 11:41:00 -0000	1.3
@@ -1,5 +1,98 @@
 User visible changes in Buildbot.
 
+* Release 0.6.1 (23 Nov 2004)
+
+** win32 improvements/bugfixes
+
+Several changes have gone in to improve portability to non-unix systems. It
+should be possible to run a build slave under windows without major issues
+(although step-by-step documentation is still greatly desired: check the
+mailing list for suggestions from current win32 users).
+
+*** PBChangeSource: use configurable directory separator, not os.sep
+
+The PBChangeSource, which listens on a TCP socket for change notices
+delivered from tools like contrib/svn_buildbot.py, was splitting source
+filenames with os.sep . This is inappropriate, because those file names are
+coming from the VC repository, not the local filesystem, and the repository
+host may be running a different OS (with a different separator convention)
+than the buildmaster host. In particular, a win32 buildmaster using a CVS
+repository running on a unix box would be confused.
+
+PBChangeSource now takes a sep= argument to indicate the separator character
+to use.
+
+*** build saving should work better
+
+windows cannot do the atomic os.rename() trick that unix can, so under win32
+the buildmaster falls back to save/delete-old/rename, which carries a slight
+risk of losing a saved build log (if the system were to crash between the
+delete-old and the rename).
+
+** new features
+
+*** test-result tracking
+
+Work has begun on fine-grained test-result handling. The eventual goal is to
+be able to track individual tests over time, and create problem reports when
+a test starts failing (which then are resolved when the test starts passing
+again). The first step towards this is an ITestResult interface, and code in
+the TrialTestParser to create such results for all non-passing tests (the
+ones for which Trial emits exception tracebacks).
+
+These test results are currently displayed in a tree-like display in a page
+accessible from each Build's page (follow the numbered link in the yellow
+box at the start of each build to get there).
+
+This interface is still in flux, as it really wants to be able to accomodate
+things like compiler warnings and tests that are skipped because of missing
+libraries or unsupported architectures.
+
+** bug fixes
+
+*** VC updates should survive temporary failures
+
+Some VC systems (CVS and SVN in particular) get upset when files are turned
+into directories or vice versa, or when repository items are moved without
+the knowledge of the VC system. The usual symptom is that a 'cvs update'
+fails where a fresh checkout succeeds.
+
+To avoid having to manually intervene, the build slaves' VC commands have
+been refactored to respond to update failures by deleting the tree and
+attempting a full checkout. This may cause some unnecessary effort when,
+e.g., the CVS server falls off the net, but in the normal case it will only
+come into play when one of these can't-cope situations arises.
+
+*** forget about an existing build when the slave detaches
+
+If the slave was lost during a build, the master did not clear the
+.currentBuild reference, making that builder unavailable for later builds.
+This has been fixed, so that losing a slave should be handled better. This
+area still needs some work, I think it's still possible to get both the
+slave and the master wedged by breaking the connection at just the right
+time. Eventually I want to be able to resume interrupted builds (especially
+when the interruption is the result of a network failure and not because the
+slave or the master actually died).
+
+*** large logfiles now consume less memory
+
+Build logs are stored as lists of (type,text) chunks, so that
+stdout/stderr/headers can be displayed differently (if they were
+distinguishable when they were generated: stdout and stderr are merged when
+usePTY=1). For multi-megabyte logfiles, a large list with many short strings
+could incur a large overhead. The new behavior is to merge same-type string
+chunks together as they are received, aiming for a chunk size of about 10kb,
+which should bring the overhead down to a more reasonable level.
+
+There remains an issue with actually delivering large logfiles over, say,
+the HTML interface. The string chunks must be merged together into a single
+string before delivery, which causes a spike in the memory usage when the
+logfile is viewed. This can also break twisted.web.distrib -type servers,
+where the underlying PB protocol imposes a 640k limit on the size of
+strings. This will be fixed (with a proper Producer/Consumer scheme) in the
+next release.
+
+
 * Release 0.6.0 (30 Sep 2004)
 
 ** new features

Index: README
===================================================================
RCS file: /cvsroot/buildbot/site/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- README	1 Oct 2004 03:27:04 -0000	1.11
+++ README	23 Nov 2004 11:41:01 -0000	1.12
@@ -84,10 +84,13 @@
 the installation process, as it will probably be easier to track down the bug
 early.
 
-If you want to test the VC checkout process, you'll need to install a tarball
-of repositories, available from http://buildbot.sf.net/ . Otherwise there are
-about 8 tests which will be skipped (all with names like testSVN and
-testArchHTTP).
+If you want to test the VC checkout process, you'll need to install a
+tarball of repositories, available from http://buildbot.sf.net/ . Otherwise
+there are about 8 tests which will be skipped (all with names like testSVN
+and testArchHTTP). If you unpack this tarball in ~/tmp, it will create
+~/tmp/buildbot-test-vc-1, and you can enable the extra tests with:
+
+ PYTHONPATH=. BUILDBOT_TEST_VC=~/tmp trial -v buildbot.test
 
 
  INSTALLING THE LIBRARIES:
@@ -122,7 +125,7 @@
 
 Now run the 'buildbot' command as follows:
 
- buildbot slave --basedir WORKDIR --master HOST:PORT --name NAME --passwd PWD
+ buildbot slave WORKDIR MASTERHOST:PORT SLAVENAME PASSWORD
 
 This will create a "TAP" file called "buildbot.tap", which bundles up all
 the state needed by the build slave application. Twisted has a tool called

Index: index.html
===================================================================
RCS file: /cvsroot/buildbot/site/index.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- index.html	1 Oct 2004 03:27:04 -0000	1.29
+++ index.html	23 Nov 2004 11:41:01 -0000	1.30
@@ -11,7 +11,7 @@
 Current contents:
 
 <ul>
-  <li>The current release is buildbot-0.6.0 . You can download the source
+  <li>The current release is buildbot-0.6.1 . You can download the source
   from the sf.net download page <a
   href="http://sourceforge.net/project/showfiles.php?group_id=73177">here</a>.
   The release is signed with my GPG public key, available <a




From warner at users.sourceforge.net  Wed Nov 24 02:37:14 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 02:37:14 +0000
Subject: [Buildbot-commits] buildbot/buildbot __init__.py,1.5,1.6
Message-ID: <E1CWn1u-0001yv-Vd@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	__init__.py 
Log Message:
(version): bump to 0.6.1+ while between releases


Index: __init__.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/__init__.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- __init__.py	23 Nov 2004 11:19:55 -0000	1.5
+++ __init__.py	24 Nov 2004 02:37:12 -0000	1.6
@@ -1,3 +1,3 @@
 #! /usr/bin/python
 
-version = "0.6.1"
+version = "0.6.1+"




From warner at users.sourceforge.net  Wed Nov 24 02:41:24 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 02:41:24 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.315,1.316
Message-ID: <E1CWn5w-0002DR-SJ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
* buildbot/status/html.py (TextLog): split render() up into
render_HEAD and render_GET. Use a Producer when sending log
chunks, to reduce memory requirements and avoid sending huge
non-Banana-able strings over web.distrib connections. Requires
peeking under the covers of IStatusLog.

* buildbot/status/builder.py (HTMLLogFile.waitUntilFinished): oops,
use defer.succeed, not the non-existent defer.success
(LogFile.waitUntilFinished): same
(LogFile.subscribe): don't add watchers to a finished logfile


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.315
retrieving revision 1.316
diff -u -d -r1.315 -r1.316
--- ChangeLog	23 Nov 2004 11:19:55 -0000	1.315
+++ ChangeLog	24 Nov 2004 02:41:22 -0000	1.316
@@ -1,5 +1,21 @@
 2004-11-23  Brian Warner  <warner at lothar.com>
 
+	* buildbot/status/html.py (TextLog): split render() up into
+	render_HEAD and render_GET. Use a Producer when sending log
+	chunks, to reduce memory requirements and avoid sending huge
+	non-Banana-able strings over web.distrib connections. Requires
+	peeking under the covers of IStatusLog.
+
+	* buildbot/status/builder.py (HTMLLogFile.waitUntilFinished): oops,
+	use defer.succeed, not the non-existent defer.success
+	(LogFile.waitUntilFinished): same
+	(LogFile.subscribe): don't add watchers to a finished logfile
+
+	* buildbot/__init__.py (version): bump to 0.6.1+ while between
+	releases
+
+2004-11-23  Brian Warner  <warner at lothar.com>
+
 	* buildbot/__init__.py (version): Releasing buildbot-0.6.1
 
 2004-11-23  Brian Warner  <warner at lothar.com>




From warner at users.sourceforge.net  Wed Nov 24 02:41:24 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 02:41:24 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status html.py,1.44,1.45 builder.py,1.44,1.45
Message-ID: <E1CWn5w-0002DP-Ud@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	html.py builder.py 
Log Message:
* buildbot/status/html.py (TextLog): split render() up into
render_HEAD and render_GET. Use a Producer when sending log
chunks, to reduce memory requirements and avoid sending huge
non-Banana-able strings over web.distrib connections. Requires
peeking under the covers of IStatusLog.

* buildbot/status/builder.py (HTMLLogFile.waitUntilFinished): oops,
use defer.succeed, not the non-existent defer.success
(LogFile.waitUntilFinished): same
(LogFile.subscribe): don't add watchers to a finished logfile


Index: builder.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/builder.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- builder.py	23 Nov 2004 10:51:03 -0000	1.44
+++ builder.py	24 Nov 2004 02:41:22 -0000	1.45
@@ -98,7 +98,7 @@
         return self.finished
     def waitUntilFinished(self):
         if self.finished:
-            d = defer.success(self)
+            d = defer.succeed(self)
         else:
             d = defer.Deferred()
             self.finishedWatchers.append(d)
@@ -113,6 +113,8 @@
         return self.entries + self.runEntries
 
     def subscribe(self, receiver, catchup):
+        if self.finished:
+            return
         self.watchers.append(receiver)
         if catchup:
             for channel, text in self.entries + self.runEntries:
@@ -213,7 +215,7 @@
     def isFinished(self):
         return True
     def waitUntilFinished(self):
-        return defer.success(self)
+        return defer.succeed(self)
 
     def getText(self):
         return self.html # looks kinda like text

Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- html.py	23 Nov 2004 03:58:15 -0000	1.44
+++ html.py	24 Nov 2004 02:41:21 -0000	1.45
@@ -456,12 +456,13 @@
 """
 
 class TextLog(Resource):
+    # a new instance of this Resource is created for each client who views
+    # it, so we can afford to track the request in the Resource.
     __implements__ = IHTMLLog,
 
     def __init__(self, original):
         Resource.__init__(self)
         self.original = original
-        self.watchers = []
 
     def htmlHeader(self, request):
         title = "Log File contents"
@@ -491,70 +492,72 @@
         data += "</body></html>\n"
         return data
 
-    def render(self, request):
+    def render_HEAD(self, request):
         asText = request.args.get("text", None)
-
         if asText:
             request.setHeader("content-type", "text/plain")
         else:
             request.setHeader("content-type", "text/html")
 
-        if request.method == "HEAD":
-            # vague approximation, ignores markup
-            request.setHeader("content-length", self.original.length)
-            return ''
-
-        data = ""
-        if not asText:
-            data += self.htmlHeader(request)
-        data += self.content(self.original.getChunks(), asText)
+        # vague approximation, ignores markup
+        request.setHeader("content-length", self.original.length)
+        return ''
 
-        # TODO: to implement a producer for this:
-        #  Create an object that knows about the LogFile. That object's
-        #  .resumeProducing method should pull text from the LogFile's
-        #  .entries, convert them to HTML, then send them to request.write .
-        #  (remember that .entries may be added while the request is being
-        #  served). When all .entries are consumed, send everything in
-        #  .runEntries (oh and do those all before they get merged into a
-        #  new .entries item). Then attach the request to our .watchers
-        #  method and make sure the LogFile knows about us.
+    def resumeProducing(self):
+        if self.chunkNumber < len(self.original.entries):
+            chunk = self.original.entries[self.chunkNumber]
+            self.chunkNumber += 1
+            self.req.write(self.content([chunk], self.asText))
+            return
+        # now send all of .runEntries in a batch
+        data = self.content(self.original.runEntries, self.asText)
+        self.req.write(data)
+        self.req.unregisterProducer()
+        # then see if there is more to come
+        self.original.subscribe(self, False)
+        d = self.original.waitUntilFinished()
+        d.addCallback(self.finished)
 
-        if self.original.finished:
-            if not asText:
-                data += self.htmlFooter()
-            return data # all done
+    def render_GET(self, req):
+        self.req = req
+        self.asText = self.req.args.get("text", None)
 
-        try:
-            request.write(data)
-        except pb.DeadReferenceError:
-            # master server died awfully early
-            return "you're never going to hear this, are you"
+        if self.asText:
+            req.setHeader("content-type", "text/plain")
+        else:
+            req.setHeader("content-type", "text/html")
 
-        self.watchers.append((request, asText))
-        self.original.subscribe(self, False)
-        self.original.waitUntilFinished().addCallback(self.finished)
+        if not self.asText:
+            req.write(self.htmlHeader(req))
 
-        d = request.notifyFinish()
-        d.addErrback(lambda why: self.watchers.remove((request, asText)))
+        self.chunkNumber = 0
+        req.registerProducer(self, False)
+        d = req.notifyFinish()
+        d.addErrback(self.stop)
         return server.NOT_DONE_YET
 
+    def stop(self, why):
+        self.original.unsubscribe(self)
+        self.req.unregisterProducer()
+        # our .finished callback may still be fired
+        self.req = None
+
     def logChunk(self, build, step, log, channel, text):
-        for request, asText in self.watchers[:]:
-            output = self.content([(channel, text)], asText)
-            try:
-                request.write(output)
-            except pb.DeadReferenceError:
-                self.watchers.remove((request, asText))
+        output = self.content([(channel, text)], self.asText)
+        try:
+            self.req.write(output)
+        except pb.DeadReferenceError:
+            log.unsubscribe(self)
 
     def finished(self, log):
-        for request, asText in self.watchers:
-            try:
-                if not asText:
-                    request.write(self.htmlFooter())
-                request.finish()
-            except pb.DeadReferenceError:
-                pass
-        self.watchers = []
+        if not self.req:
+            return
+        try:
+            if not self.asText:
+                self.req.write(self.htmlFooter())
+            self.req.finish()
+        except pb.DeadReferenceError:
+            pass
 
 components.registerAdapter(TextLog, interfaces.IStatusLog, IHTMLLog)
 




From warner at users.sourceforge.net  Wed Nov 24 03:35:08 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 03:35:08 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.316,1.317
Message-ID: <E1CWnvw-0005Tu-FQ@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(TextLog.resumeProducing): fix the "as text" link, handle client
disconnects that occur while we're still sending old chunks.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.316
retrieving revision 1.317
diff -u -d -r1.316 -r1.317
--- ChangeLog	24 Nov 2004 02:41:22 -0000	1.316
+++ ChangeLog	24 Nov 2004 03:35:05 -0000	1.317
@@ -5,6 +5,8 @@
 	chunks, to reduce memory requirements and avoid sending huge
 	non-Banana-able strings over web.distrib connections. Requires
 	peeking under the covers of IStatusLog.
+	(TextLog.resumeProducing): fix the "as text" link, handle client
+	disconnects that occur while we're still sending old chunks.
 
 	* buildbot/status/builder.py (HTMLLogFile.waitUntilFinished): oops,
 	use defer.succeed, not the non-existent defer.success




From warner at users.sourceforge.net  Wed Nov 24 03:35:07 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 03:35:07 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status html.py,1.45,1.46
Message-ID: <E1CWnvw-0005Tn-0W@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	html.py 
Log Message:
(TextLog.resumeProducing): fix the "as text" link, handle client
disconnects that occur while we're still sending old chunks.


Index: html.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/html.py,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- html.py	24 Nov 2004 02:41:21 -0000	1.45
+++ html.py	24 Nov 2004 03:35:05 -0000	1.46
@@ -475,11 +475,11 @@
         data += "<pre>\n"
         return data
 
-    def content(self, entries, asText):
+    def content(self, entries):
         spanfmt = '<span class="%s">%s</span>'
         data = ""
         for type, entry in entries:
-            if asText:
+            if self.asText:
                 if type != builder.HEADER:
                     data += entry
             else:
@@ -493,8 +493,7 @@
         return data
 
     def render_HEAD(self, request):
-        asText = request.args.get("text", None)
-        if asText:
+        if request.args.has_key("text"):
             request.setHeader("content-type", "text/plain")
         else:
             request.setHeader("content-type", "text/html")
@@ -504,23 +503,32 @@
         return ''
 
     def resumeProducing(self):
-        if self.chunkNumber < len(self.original.entries):
+        while self.chunkNumber < len(self.original.entries):
             chunk = self.original.entries[self.chunkNumber]
             self.chunkNumber += 1
-            self.req.write(self.content([chunk], self.asText))
-            return
+            data = self.content([chunk])
+            if data:
+                self.req.write(data)
+                return
         # now send all of .runEntries in a batch
-        data = self.content(self.original.runEntries, self.asText)
-        self.req.write(data)
+        data = self.content(self.original.runEntries)
+        if data:
+            self.req.write(data)
         self.req.unregisterProducer()
         # then see if there is more to come
         self.original.subscribe(self, False)
+        self.subscribed = True
         d = self.original.waitUntilFinished()
         d.addCallback(self.finished)
 
+    def stopProducing(self):
+        pass
+
     def render_GET(self, req):
         self.req = req
-        self.asText = self.req.args.get("text", None)
+        self.asText = False
+        if self.req.args.has_key("text"):
+            self.asText = True
 
         if self.asText:
             req.setHeader("content-type", "text/plain")
@@ -531,19 +539,22 @@
             req.write(self.htmlHeader(req))
 
         self.chunkNumber = 0
+        self.subscribed = False
         req.registerProducer(self, False)
         d = req.notifyFinish()
         d.addErrback(self.stop)
         return server.NOT_DONE_YET
 
     def stop(self, why):
-        self.original.unsubscribe(self)
+        if self.subscribed:
+            self.original.unsubscribe(self)
+            self.subscribed = False
         self.req.unregisterProducer()
         # our .finished callback may still be fired
         self.req = None
 
     def logChunk(self, build, step, log, channel, text):
-        output = self.content([(channel, text)], self.asText)
+        output = self.content([(channel, text)])
         try:
             self.req.write(output)
         except pb.DeadReferenceError:




From warner at users.sourceforge.net  Wed Nov 24 22:02:06 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 22:02:06 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.317,1.318
Message-ID: <E1CX5DO-0000UT-UY@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(VC.testArch): unregister the test archive after the test completes, to avoid
cluttering the user's 'tla archives' listing with a bogus entry. Arch doesn't
happen to provide any way to override the use of ~/.arch-params/, so there
isn't a convenient way to avoid touching the setup of the user who runs the
test.
(VC_HTTP.testArchHTTP): same


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -d -r1.317 -r1.318
--- ChangeLog	24 Nov 2004 03:35:05 -0000	1.317
+++ ChangeLog	24 Nov 2004 22:02:03 -0000	1.318
@@ -1,3 +1,13 @@
+2004-11-24  Brian Warner  <warner at lothar.com>
+
+	* buildbot/test/test_vc.py (VC.testArch): unregister the test
+	archive after the test completes, to avoid cluttering the user's
+	'tla archives' listing with a bogus entry. Arch doesn't happen to
+	provide any way to override the use of ~/.arch-params/, so there
+	isn't a convenient way to avoid touching the setup of the user who
+	runs the test.
+	(VC_HTTP.testArchHTTP): same
+
 2004-11-23  Brian Warner  <warner at lothar.com>
 
 	* buildbot/status/html.py (TextLog): split render() up into




From warner at users.sourceforge.net  Wed Nov 24 22:02:05 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Wed, 24 Nov 2004 22:02:05 +0000
Subject: [Buildbot-commits] buildbot/buildbot/test test_vc.py,1.18,1.19
Message-ID: <E1CX5Df-0000UO-V0@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	test_vc.py 
Log Message:
(VC.testArch): unregister the test archive after the test completes, to avoid
cluttering the user's 'tla archives' listing with a bogus entry. Arch doesn't
happen to provide any way to override the use of ~/.arch-params/, so there
isn't a convenient way to avoid touching the setup of the user who runs the
test.
(VC_HTTP.testArchHTTP): same


Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- test_vc.py	28 Oct 2004 07:27:07 -0000	1.18
+++ test_vc.py	24 Nov 2004 22:02:01 -0000	1.19
@@ -348,10 +348,12 @@
         # some better test logic, probably involving a copy of the
         # repository that has a few changes checked in.
 
-        # TODO: run 'tla register-archive -d test at buildbot.sf.net--testvc1'
-        # to get rid of the leftover archive this leaves in the user's 'tla
-        # archives' listing. We can use archive= t set it explicitly, but
-        # if you change it from the default, then 'tla update' won't work.
+        # tell tla to get rid of the leftover archive this test leaves in the
+        # user's 'tla archives' listing. The name of this archive is provided
+        # by the repository tarball, so the following command must use the
+        # same name. We could use archive= to set it explicitly, but if you
+        # change it from the default, then 'tla update' won't work.
+        os.system("tla register-archive -d test at buildbot.sf.net--testvc")
 
 class VC_HTTP(SignalMixin, SetupMixin, unittest.TestCase):
     serveHTTP = RepositoryPath
@@ -371,6 +373,7 @@
             'url': Repository_HTTP % self.httpPort + "/Arch-Repository",
             'version': "testvc--mainline--1",
             }, testRetry=False)
+        os.system("tla register-archive -d test at buildbot.sf.net--testvc")
 
 class Patch(SignalMixin, SetupMixin, unittest.TestCase):
 




From warner at users.sourceforge.net  Thu Nov 25 00:05:03 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Thu, 25 Nov 2004 00:05:03 +0000
Subject: [Buildbot-commits] site index.html,1.30,1.31
Message-ID: <E1CX78B-0007eB-Sj@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	index.html 
Log Message:
add radix's Nunatak usage


Index: index.html
===================================================================
RCS file: /cvsroot/buildbot/site/index.html,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- index.html	23 Nov 2004 11:41:01 -0000	1.30
+++ index.html	25 Nov 2004 00:05:00 -0000	1.31
@@ -57,7 +57,8 @@
   Enemy Territory Linux.</li>
 
   <li>Christopher Armstrong (radix) has set up a Buildbot to do web testing
-  (using MaxQ) for one of his clients.</li>
+  (using MaxQ) for one of his clients, as well as internally at Nunatak to
+  run python unit tests.</li>
 
   <li>'nbm' reports that <q>the first-or-second-largest media company
   in South Africa uses buildbot</q>, testing PHP code.</li>
@@ -107,5 +108,5 @@
      align="right">
 </A>
 
-<!-- hhmts start -->Last modified: Thu Sep 30 20:25:02 PDT 2004 <!-- hhmts end -->
+<!-- hhmts start -->Last modified: Wed Nov 24 16:04:37 PST 2004 <!-- hhmts end -->
 </body> </html>




From warner at users.sourceforge.net  Sun Nov 28 01:53:55 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 28 Nov 2004 01:53:55 +0000
Subject: [Buildbot-commits] buildbot ChangeLog,1.318,1.319
Message-ID: <E1CYEGB-0006OM-PA@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	ChangeLog 
Log Message:
(IrcStatusBot.convertTime): utility method to express ETA time like "2m45s"
instead of "165 seconds"


Index: ChangeLog
===================================================================
RCS file: /cvsroot/buildbot/buildbot/ChangeLog,v
retrieving revision 1.318
retrieving revision 1.319
diff -u -d -r1.318 -r1.319
--- ChangeLog	24 Nov 2004 22:02:03 -0000	1.318
+++ ChangeLog	28 Nov 2004 01:53:52 -0000	1.319
@@ -1,3 +1,8 @@
+2004-11-27  Brian Warner  <warner at lothar.com>
+
+	* buildbot/status/words.py (IrcStatusBot.convertTime): utility
+	method to express ETA time like "2m45s" instead of "165 seconds"
+
 2004-11-24  Brian Warner  <warner at lothar.com>
 
 	* buildbot/test/test_vc.py (VC.testArch): unregister the test




From warner at users.sourceforge.net  Sun Nov 28 05:20:26 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 28 Nov 2004 05:20:26 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status words.py,1.28,1.29
Message-ID: <E1CYHU2-0008Bg-AO@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	words.py 
Log Message:
oops, int-vs-float coercion strikes again. fix it.


Index: words.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/words.py,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- words.py	28 Nov 2004 01:53:52 -0000	1.28
+++ words.py	28 Nov 2004 05:20:23 -0000	1.29
@@ -126,11 +126,11 @@
     def convertTime(self, seconds):
         if seconds < 60:
             return "%d seconds" % seconds
-        minutes = seconds / 60
+        minutes = int(seconds / 60)
         seconds = seconds - 60*minutes
         if minutes < 60:
             return "%dm%02ds" % (minutes, seconds)
-        hours = minutes / 60
+        hours = int(minutes / 60)
         minutes = minutes - 60*hours
         return "%dh%02dm%02ds" % (hours, minutes, seconds)
 




From warner at users.sourceforge.net  Sun Nov 28 01:53:55 2004
From: warner at users.sourceforge.net (Brian Warner)
Date: Sun, 28 Nov 2004 01:53:55 +0000
Subject: [Buildbot-commits] buildbot/buildbot/status words.py,1.27,1.28
Message-ID: <E1CYEGB-0006OK-PI@sc8-pr-cvs1.sourceforge.net>

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

Modified Files:
	words.py 
Log Message:
(IrcStatusBot.convertTime): utility method to express ETA time like "2m45s"
instead of "165 seconds"


Index: words.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/words.py,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- words.py	12 Oct 2004 17:49:30 -0000	1.27
+++ words.py	28 Nov 2004 01:53:52 -0000	1.28
@@ -123,6 +123,17 @@
         builders = [self.status.getBuilder(n) for n in names]
         return builders
 
+    def convertTime(self, seconds):
+        if seconds < 60:
+            return "%d seconds" % seconds
+        minutes = seconds / 60
+        seconds = seconds - 60*minutes
+        if minutes < 60:
+            return "%dm%02ds" % (minutes, seconds)
+        hours = minutes / 60
+        minutes = minutes - 60*hours
+        return "%dh%02dm%02ds" % (hours, minutes, seconds)
+
     def doSilly(self, user, reply, message):
         response = self.silly[message]
         if type(response) != type([]):
@@ -188,7 +199,7 @@
             % (which, build.getNumber())
         eta = build.getETA()
         if eta is not None:
-            r += " [%d seconds]" % eta
+            r += " [%s]" % self.convertTime(eta)
         r += ".."
         self.reply(reply, r)
     command_WATCH.usage = "watch <which> - announce the completion of an active build"
@@ -238,7 +249,7 @@
         eta = s.getETA()
         response = "build #%d forced" % s.getNumber()
         if eta is not None:
-            response = "build forced [ETA %d seconds]" % eta
+            response = "build forced [ETA %s]" % self.convertTime(eta)
         self.reply(reply, response)
         self.reply(reply, "I'll give a shout when the build finishes")
         d = s.waitUntilFinished()
@@ -257,14 +268,14 @@
                 str += ", last build %s secs ago: %s" % \
                        (int(util.now() - finished), " ".join(last.getText()))
         if state == "waiting":
-            str += " [next build in %d seconds]" % ETA
+            str += " [next build in %s]" % self.convertTime(ETA)
         if state == "building":
             build = b.getCurrentBuild()
             assert build
             step = build.getCurrentStep()
             str += " (%s)" % " ".join(step.getText())
             if ETA is not None:
-                str += " [ETA %d seconds]" % ETA
+                str += " [ETA %s]" % self.convertTime(ETA)
         self.reply(reply, str)
 
     def emit_last(self, reply, which):