Merge lp:~al-maisan/launchpad/merge-conflicts-2 into lp:launchpad/db-devel

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

resolves stable -> db-devel merge conflicts.

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
--- lib/lp/soyuz/tests/test_buildqueue.py	2010-02-23 16:12:55 +0000
+++ lib/lp/soyuz/tests/test_buildqueue.py	2010-02-23 19:37:13 +0000
@@ -495,7 +495,9 @@
 class TestMinTimeToNextBuilder(SingleArchBuildsBase):
     """Test estimated time-to-builder with builds targetting a single
     processor."""
-    def test_min_time_to_next_builder(self):
+    # XXX Michael Nelson 20100223 bug=525329
+    # This is still failing spuriously.
+    def disabled_test_min_time_to_next_builder(self):
         """When is the next builder capable of running the job at the head of
         the queue becoming available?"""
         # Test the estimation of the minimum time until a builder becomes
@@ -682,8 +684,8 @@
 
 class TestMinTimeToNextBuilderMulti(MultiArchBuildsBase):
     """Test estimated time-to-builder with builds and multiple processors."""
-    # XXX sinzui 2010-02-21 bug=525329: disabled because of a spurious failure
-    # in https://lpbuildbot.canonical.com/builders/db_lp/builds/527.
+    # XXX Michael Nelson 20100223 bug=525329
+    # This is still failing spuriously.
     def disabled_test_min_time_to_next_builder(self):
         """When is the next builder capable of running the job at the head of
         the queue becoming available?"""