Launchpad itself

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

  1. merge-conflicts-2
  2. Merge into db-devel
Proposed by Muharem Hrnjadovic
Status: Merged
Approved by: Brad Crittenden
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
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+19994@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Muharem Hrnjadovic (al-maisan) wrote :

resolves stable -> db-devel merge conflicts.

Revision history for this message
Brad Crittenden (bac) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
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 class TestMinTimeToNextBuilder(SingleArchBuildsBase):
6 """Test estimated time-to-builder with builds targetting a single
7 processor."""
8- def test_min_time_to_next_builder(self):
9+ # XXX Michael Nelson 20100223 bug=525329
10+ # This is still failing spuriously.
11+ def disabled_test_min_time_to_next_builder(self):
12 """When is the next builder capable of running the job at the head of
13 the queue becoming available?"""
14 # Test the estimation of the minimum time until a builder becomes
15@@ -682,8 +684,8 @@
16
17 class TestMinTimeToNextBuilderMulti(MultiArchBuildsBase):
18 """Test estimated time-to-builder with builds and multiple processors."""
19- # XXX sinzui 2010-02-21 bug=525329: disabled because of a spurious failure
20- # in https://lpbuildbot.canonical.com/builders/db_lp/builds/527.
21+ # XXX Michael Nelson 20100223 bug=525329
22+ # This is still failing spuriously.
23 def disabled_test_min_time_to_next_builder(self):
24 """When is the next builder capable of running the job at the head of
25 the queue becoming available?"""

Subscribers

People subscribed via source and target branches

to status/vote changes: