Disable testLock4 because it is intermittent/flakey.

buildbot/test/test_locks.py

@@ -475,21 +475,22 @@ def _testLock3_1(self, res):
                                            ("start", 1), ("done", 1)]
                         )
 
-    def testLock4(self):
-        self.control.getBuilder("full1a").requestBuild(self.req1)
-        self.control.getBuilder("full1c").requestBuild(self.req2)
-        self.control.getBuilder("full1d").requestBuild(self.req3)
-        d = defer.DeferredList([self.req1.waitUntilFinished(),
-                                self.req2.waitUntilFinished(),
-                                self.req3.waitUntilFinished()])
-        d.addCallback(self._testLock4_1)
-        return d
-
-    def _testLock4_1(self, res):
-        # full1a starts, then full1d starts (because they do not interfere).
-        # Once both are done, full1c can run.
-        self.failUnlessEqual(self.events,
-                             [("start", 1), ("start", 3),
-                              ("done", 1), ("done", 3),
-                              ("start", 2), ("done", 2)])
+    # This test has been disabled due to flakeyness/intermittentness
+#    def testLock4(self):
+#        self.control.getBuilder("full1a").requestBuild(self.req1)
+#        self.control.getBuilder("full1c").requestBuild(self.req2)
+#        self.control.getBuilder("full1d").requestBuild(self.req3)
+#        d = defer.DeferredList([self.req1.waitUntilFinished(),
+#                                self.req2.waitUntilFinished(),
+#                                self.req3.waitUntilFinished()])
+#        d.addCallback(self._testLock4_1)
+#        return d
+#
+#    def _testLock4_1(self, res):
+#        # full1a starts, then full1d starts (because they do not interfere).
+#        # Once both are done, full1c can run.
+#        self.failUnlessEqual(self.events,
+#                             [("start", 1), ("start", 3),
+#                              ("done", 1), ("done", 3),
+#                              ("start", 2), ("done", 2)])