[Buildbot-commits] buildbot/buildbot/slave commands.py,1.64,1.65

Brian Warner warner at users.sourceforge.net
Fri Sep 15 14:49:35 UTC 2006


Update of /cvsroot/buildbot/buildbot/buildbot/slave
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv21663/buildbot/slave

Modified Files:
	commands.py 
Log Message:
[project @ filetransfer: add a unit test, docs, do some cleanup]

Original author: warner at lothar.com
Date: 2006-09-09 06:11:59

Index: commands.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/slave/commands.py,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- commands.py	15 Sep 2006 14:49:06 -0000	1.64
+++ commands.py	15 Sep 2006 14:49:33 -0000	1.65
@@ -680,6 +680,8 @@
 
     """
 
+    debug = False
+
     def setup(self,args):
         self.workdir = args['workdir']
         self.filename = os.path.basename(args['slavesrc'])
@@ -689,19 +691,23 @@
         self.stderr = None
         self.rc = 0
 
-        self.debug = 0
-	if self.debug: log.msg('SlaveFileUploadCommand started')
+	if self.debug:
+            log.msg('SlaveFileUploadCommand started')
 
         # Open file
-        self.path = os.path.join(self.builder.basedir,self.workdir,self.filename)
+        self.path = os.path.join(self.builder.basedir,
+                                 self.workdir,
+                                 self.filename)
         try:
             self.fp = open(self.path, 'r')
-            if self.debug: log.msg('Opened %r for upload' % self.path)
+            if self.debug:
+                log.msg('Opened %r for upload' % self.path)
         except:
             self.fp = None
             self.stderr = 'Cannot open file %r for upload' % self.path
             self.rc = 1
-            if self.debug: log.msg('Cannot open file %r for upload' % self.path)
+            if self.debug:
+                log.msg('Cannot open file %r for upload' % self.path)
 
 
     def start(self):
@@ -715,7 +721,8 @@
         Write a block of data to the remote writer
         """
         if self.interrupted or self.fp is None:
-            if self.debug: log.msg('SlaveFileUploadCommand._writeBlock(): end')
+            if self.debug:
+                log.msg('SlaveFileUploadCommand._writeBlock(): end')
             d = self.writer.callRemote('close')
             d.addCallback(lambda _: self.finished())
             return
@@ -733,8 +740,9 @@
         else:
             data = self.fp.read(length)
 
-        if self.debug: log.msg('SlaveFileUploadCommand._writeBlock(): '+
-                        'allowed=%d readlen=%d' % (length,len(data)))
+        if self.debug:
+            log.msg('SlaveFileUploadCommand._writeBlock(): '+
+                    'allowed=%d readlen=%d' % (length,len(data)))
         if len(data) == 0:
             d = self.writer.callRemote('close')
             d.addCallback(lambda _: self.finished())
@@ -747,7 +755,8 @@
 
 
     def interrupt(self):
-        if self.debug: log.msg('interrupted')
+        if self.debug:
+            log.msg('interrupted')
         if self.interrupted:
             return
         if self.stderr is None:
@@ -758,7 +767,8 @@
 
 
     def finished(self):
-        if self.debug: log.msg('finished: stderr=%r, rc=%r' % (self.stderr,self.rc))
+        if self.debug:
+            log.msg('finished: stderr=%r, rc=%r' % (self.stderr,self.rc))
         if self.stderr is None:
             self.sendStatus({'rc':self.rc})
         else:
@@ -780,6 +790,7 @@
         - ['blocksize']: max size for one data block
 
     """
+    debug = False
 
     def setup(self,args):
         self.workdir = args['workdir']
@@ -790,14 +801,17 @@
         self.stderr = None
         self.rc = 0
 
-        self.debug = 0
-	if self.debug: log.msg('SlaveFileDownloadCommand started')
+	if self.debug:
+            log.msg('SlaveFileDownloadCommand started')
 
         # Open file
-        self.path = os.path.join(self.builder.basedir,self.workdir,self.filename)
+        self.path = os.path.join(self.builder.basedir,
+                                 self.workdir,
+                                 self.filename)
         try:
             self.fp = open(self.path, 'w')
-            if self.debug: log.msg('Opened %r for download' % self.path)
+            if self.debug:
+                log.msg('Opened %r for download' % self.path)
         except:
             self.fp = None
             self.stderr = 'Cannot open file %r for download' % self.path
@@ -817,7 +831,8 @@
         Read a block of data from the remote reader
         """
         if self.interrupted or self.fp is None:
-            if self.debug: log.msg('SlaveFileDownloadCommand._readBlock(): end')
+            if self.debug:
+                log.msg('SlaveFileDownloadCommand._readBlock(): end')
             d = self.reader.callRemote('close')
             d.addCallback(lambda _: self.finished())
             return
@@ -838,8 +853,9 @@
             d.addCallback(self._writeData)
 
     def _writeData(self,data):
-        if self.debug: log.msg('SlaveFileDownloadCommand._readBlock(): '+
-                                                        'readlen=%d' % len(data))
+        if self.debug:
+            log.msg('SlaveFileDownloadCommand._readBlock(): '+
+                    'readlen=%d' % len(data))
         if len(data) == 0:
             d = self.reader.callRemote('close')
             d.addCallback(lambda _: self.finished())
@@ -852,7 +868,8 @@
 
 
     def interrupt(self):
-        if self.debug: log.msg('interrupted')
+        if self.debug:
+            log.msg('interrupted')
         if self.interrupted:
             return
         if self.stderr is None:
@@ -866,8 +883,8 @@
         if self.fp is not None:
             self.fp.close()
 
-        if self.debug: log.msg('finished: stderr=%r, rc=%r'
-                                                    % (self.stderr,self.rc))
+        if self.debug:
+            log.msg('finished: stderr=%r, rc=%r' % (self.stderr,self.rc))
         if self.stderr is None:
             self.sendStatus({'rc':self.rc})
         else:





More information about the Commits mailing list