[Buildbot-commits] buildbot/buildbot/test test_vc.py,1.82,1.83

[Brian Warner]

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

Modified Files:
	test_vc.py 
Log Message:
[project @ test_vc.py: set usePTY=False, to avoid SIGHUP-based failures that I've started seein on recent debian systems]

Original author: warner at lothar.com
Date: 2008-03-18 19:37:00+00:00

Index: test_vc.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/test/test_vc.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- test_vc.py	28 Nov 2007 02:49:43 -0000	1.82
+++ test_vc.py	18 Mar 2008 19:56:51 -0000	1.83
@@ -439,7 +439,7 @@
     def connectSlave(self):
         port = self.master.slavePort._port.getHost().port
         slave = bot.BuildSlave("localhost", port, "bot1", "sekrit",
-                               self.slavebase, keepalive=0, usePTY=1)
+                               self.slavebase, keepalive=0, usePTY=False)
         self.slave = slave
         slave.startService()
         d = self.master.botmaster.waitUntilBuilderAttached("vc")
@@ -559,11 +559,13 @@
         d.addCallback(lambda res: self.loadConfig(config % 'copy'))
         d.addCallback(lambda res: log.msg("testing copy"))
         d.addCallback(self._do_vctest_copy)
+        d.addCallback(lambda res: log.msg("did copy test"))
         if self.metadir:
             d.addCallback(lambda res: log.msg("doing export"))
             d.addCallback(lambda res: self.loadConfig(config % 'export'))
             d.addCallback(lambda res: log.msg("testing export"))
             d.addCallback(self._do_vctest_export)
+            d.addCallback(lambda res: log.msg("did export test"))
         return d
 
     def _do_vctest_clobber(self, res):
@@ -698,10 +700,12 @@
         pass
 
     def _do_vctest_copy(self, res):
+        log.msg("_do_vctest_copy 1")
         d = self.doBuild() # copy rebuild clobbers new files
         d.addCallback(self._do_vctest_copy_1)
         return d
     def _do_vctest_copy_1(self, bs):
+        log.msg("_do_vctest_copy 2")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")
@@ -714,6 +718,7 @@
         d.addCallback(self._do_vctest_copy_2)
         return d
     def _do_vctest_copy_2(self, bs):
+        log.msg("_do_vctest_copy 3")
         if self.metadir:
             self.shouldExist(self.workdir, self.metadir)
         self.shouldNotExist(self.workdir, "newfile")