Merge lp:~julian-edwards/launchpad/land-bm-cowboy-bug-574993 into lp:launchpad

[Julian Edwards]

This is a simple branch that lands some currently cowboyed code on cesium that
stops the buildd-manager from disabling builders when there's a communication
failure with the builder (these are usually transient).

The offending code is commented out now, and I've filed a new bug and included
it in the XXX in the code to make it easy to restore the functionality + test
later when the bug is fixed.

[Michael Nelson (michael.nelson)]

Thanks Julian.

If you're feeling pedantic you could update the XXX's:
https://dev.launchpad.net/PolicyandProcess/XXXPolicy

r=me

review: Approve (code)

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2010-04-23 15:03:02 +0000
+++ lib/lp/buildmaster/manager.py	2010-05-27 13:35:57 +0000
@@ -201,7 +201,10 @@
         builder = getUtility(IBuilderSet)[self.slave.name]
         # Builders that fail to reset should be disabled as per bug
         # 563353.
-        builder.failBuilder(self.info)
+        # XXX Julian bug=586362
+        # This is disabled until this code is not also used for dispatch
+        # failures where we *don't* want to disable the builder.
+        # builder.failBuilder(self.info)
         self._cleanJob(builder.currentjob)
 
 
 
=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2010-04-23 13:42:50 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2010-05-27 13:35:57 +0000
@@ -832,7 +832,9 @@
 
         self.assertJobIsClean(job_id)
 
-        self.assertFalse(builder.builderok)
+        # XXX Julian
+        # Disabled test until bug 586362 is fixed.
+        #self.assertFalse(builder.builderok)
         self.assertEqual(None, builder.currentjob)
 
     def testFailDispatchResult(self):