1
=== modified file 'lib/lp/soyuz/tests/test_buildqueue.py'
2
--- lib/lp/soyuz/tests/test_buildqueue.py	2010-02-23 16:12:55 +0000
3
+++ lib/lp/soyuz/tests/test_buildqueue.py	2010-02-23 19:37:13 +0000
4
@@ -495,7 +495,9 @@
5
495
class TestMinTimeToNextBuilder(SingleArchBuildsBase):
495
class TestMinTimeToNextBuilder(SingleArchBuildsBase):
6
496
    """Test estimated time-to-builder with builds targetting a single
496
    """Test estimated time-to-builder with builds targetting a single
7
497
    processor."""
497
    processor."""
9
498
    def test_min_time_to_next_builder(self):
498
    # XXX Michael Nelson 20100223 bug=525329
10
499
    # This is still failing spuriously.
11
500
    def disabled_test_min_time_to_next_builder(self):
12
499
        """When is the next builder capable of running the job at the head of
501
        """When is the next builder capable of running the job at the head of
13
500
        the queue becoming available?"""
502
        the queue becoming available?"""
14
501
        # Test the estimation of the minimum time until a builder becomes
503
        # Test the estimation of the minimum time until a builder becomes
15
@@ -682,8 +684,8 @@
16
682
684
17
683
class TestMinTimeToNextBuilderMulti(MultiArchBuildsBase):
685
class TestMinTimeToNextBuilderMulti(MultiArchBuildsBase):
18
684
    """Test estimated time-to-builder with builds and multiple processors."""
686
    """Test estimated time-to-builder with builds and multiple processors."""
21
685
    # XXX sinzui 2010-02-21 bug=525329: disabled because of a spurious failure
687
    # XXX Michael Nelson 20100223 bug=525329
22
686
    # in https://lpbuildbot.canonical.com/builders/db_lp/builds/527.
688
    # This is still failing spuriously.
23
687
    def disabled_test_min_time_to_next_builder(self):
689
    def disabled_test_min_time_to_next_builder(self):
24
688
        """When is the next builder capable of running the job at the head of
690
        """When is the next builder capable of running the job at the head of
25
689
        the queue becoming available?"""
691
        the queue becoming available?"""
Status:	Merged
Approved by:	Brad Crittenden on 2010-02-23
Approved revision:	not available
Merged at revision:	not available
Proposed branch:	lp:~al-maisan/launchpad/merge-conflicts-2
Merge into:	lp:launchpad/db-devel
Diff against target:	25 lines (+5/-3) 1 file modified lib/lp/soyuz/tests/test_buildqueue.py (+5/-3)
To merge this branch:	bzr merge lp:~al-maisan/launchpad/merge-conflicts-2
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Brad Crittenden (community)	code	2010-02-23	Approve on 2010-02-23
Review via email: mp+19994@code.launchpad.net