Merge lp:~frankban/launchpad/bug-904335-get-tags into lp:launchpad

[Francesco Banconi]

= Summary =

Project groups needs a way to aggregate milestones, and introducing milestone
tags seems a way to do that in a flexible manner.

== Proposed fix ==

A Project Group Milestone Tag object is needed to aggregate milestones
inside a project group. This patch introduces a convenient interface and
its implementation: the behaviour of the new model must be similar to what
is already present in Project Group Milestones. Above all we need the
ability to retrieve bugtasks and specifications associated with a milestone
tag.

== Pre-implementation notes ==

The concept of milestone tag was controversial but appears to be a good
tradeoff to meet Linaro needs. A db-devel change is needed to get milestone
tags work. That change is present in
lp:~frankban/launchpad/db-milestonetags-480123

== Implementation details ==

A milestone interfaces refactoring is present in this patch.

IMilestoneData is now a base interface for any other milestone-like
interface, and IAbstractMilestone is introduced as an intermediate interface
for milestone.
Both IMilestone and IProjectGroupMilestone are IAbstractMilestone subclasses.
Both IMilestone and IProjectGroupMilestoneTag (a marker interface) are
IMilestoneData subclasses.

The milestone model now has getter and setter methods for tags.

A MilestoneTag model is introduced as a storm interface to the new
milestonetag table.
A ProjectGroupMilestoneTag model is used to retrieve bugtasks
and specifications.

== Tests ==

bin/test -vv lp.registry.tests.test_milestone
bin/test -vv lp.registry.tests.test_milestonetag
bin/test -vv -t lp.registry.stories.webservice.xx-project-registry

== Demo and Q/A ==

The changes are not visible in the web ui.
However, due to milestone refactoring, checking the various milestone
pages may be a good idea.

[Gary Poster (gary)]

Hi Francesco. Thank you for this good work.

I am conditionally approving this, with the changes I note below. If you disagree with my requests, that's fine; we can just work it out when our work hours overlap.

- line 88 of the diff has an XXX that we need to address ("XXX frankban 2011-12-16 further investigation needed"). We need to either address and remove the XXX or follow the XXX policy and give it a bug (see https://dev.launchpad.net/PolicyandProcess/XXXPolicy). You said that we could not address the XXX without significant refactoring; and my further understanding was that we did not need the XXX behavior for our goals. Therefore we pursued what would be necessary to follow the XXX policy. I would like to see the following:
  * You file a bug for adding support to exclude conjoined bug tasks from milestone tag searches.
  * You add that bug number to the XXX, per the policy, with a comment that states the problem to be solved (not the fact that it needs more investigation).
  * You change the ValueError check ("if (params.exclude_conjoined_tasks and not (params.milestone or params.milestone_tag)):") to blow up if someone tries to exclude conjoined tasks with a milestone tag, so that it is clear that it is not supported. A better error for this particular case might be NotImplementedError. You add an XXX to this error with the same bug number, clarifying that it can be removed when the bug is resolved.
  * For this to work, we'll need to change the call in getPrecachedNonConjoinedBugTasks to only ask for excluding non-conjoined bug tasks when it is possible. This again would be an XXX with the same number. Alternatively, you could change whatever code uses that function to use a different one, I suppose.

I can see an argument for what you have done, which pretends to support excluding the conjoined bug tasks but does not. I really think being clear about it is better. Solving it would be better still, of course. I'd be happy to review the concerns about performing the refactoring if you think that might have a chance of helping; however, I'm also fine trusting the analysis that you and Brad performed.

- You have used tabs instead of spaces, such as in the zcml files (see lines 278 and 279 of the current diff). Please switch to spaces only.

- We have functionality and code to handle user metadata on metadata tags. I think we should probably have a few tests of that.

Lastly, here are comments, notes and suggestions.

- The tests are good. Thank you.

- Our style guide states that our comments should be full sentences. Therefore, "# Circular reference prevention." would be better written as "# Prevent circular references." I don't require this change, but it would be nice.

- I suggest adding comments to getTags and setTags indicating that the tags are not a property because of the "user" argument to setTags, and the Launchpad desire to avoid model code that gets the user from the request or the "launchbag" thread locals.

- On IRC we discussed whether you needed to move milestone_tags to the end of the argument list of BugTaskSearchParams's __init__, for backwards compatibility for code that used placeful arguments...

review: Approve

[Francis J. Lacoste (flacoste)]

I don't think it's worth supporting excluding conjoined bug tasks in this. We are planning to remove the concept altogether soon (by having all bugtasks explicitely target a series). It's likely that Deryck's squad will handle that work as we have two escalated bugs around that area and everyone is keen on making this happen.

So I think simply raising an exception here is fine. Once we have only series bugtasks, that guard can go.

See https://dev.launchpad.net/LEP/OnlySeriesTasks and the two related escalated bugs are bug 314432 and bug 857109

[Francesco Banconi (frankban)]

Thanks Gary and Francis for your suggestions. I'm working on it.
Gary: to add user metadata tests i've introduced a new Milestone.getTagsData method that maybe needs your review.

[Gary Poster (gary)]

The changes look great! We talked on IRC about a few small text changes (s/yet/still/, desiderable -> desirable, MiletsoneTag -> MilestoneTag), and a few optional ideas I gave: you could assert that the metadata date was a datetime (I like this), and you could make getTagsData into a readonly property (I don't really like this, but it would work).

Thanks again

Gary

[Francesco Banconi (frankban)]

Thank you Gary, fixed typos and switched to isinstance assertion for date_created.

=== modified file 'buildout-templates/bin/retest.in'
--- buildout-templates/bin/retest.in	2012-01-09 13:42:03 +0000
+++ buildout-templates/bin/retest.in	2012-01-05 16:22:45 +0000
@@ -28,11 +28,7 @@
 import os
 import re
 import sys
-<<<<<<< TREE
 from itertools import takewhile, imap
-=======
-from itertools import takewhile
->>>>>>> MERGE-SOURCE
 
 ${python-relative-path-setup}
 

=== removed file 'database/schema/patch-2209-00-4.sql'
--- database/schema/patch-2209-00-4.sql	2012-01-09 13:42:03 +0000
+++ database/schema/patch-2209-00-4.sql	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-SET client_min_messages=ERROR;
-
-CREATE OR REPLACE FUNCTION check_email_address_person_account(
-    person integer, account integer)
-    RETURNS boolean
-    LANGUAGE plpythonu IMMUTABLE RETURNS NULL ON NULL INPUT AS
-$$
-    # It's possible for an EmailAddress to be created without an
-    # account. If that happens, and this function is called, we return
-    # True so as to avoid breakages.
-    if account is None:
-        return True
-    results = plpy.execute("""
-        SELECT account FROM Person WHERE id = %s""" % person)
-    # If there are no accounts with that Person in the DB, or the Person
-    # is new and hasn't yet been linked to an account, return success
-    # anyway. This helps avoid the PGRestore breaking (and referential
-    # integrity will prevent this from causing bugs later.
-    if results.nrows() == 0 or results[0]['account'] is None:
-        return True
-    return results[0]['account'] == account
-$$;
-
-COMMENT ON FUNCTION check_email_address_person_account(integer, integer) IS
-'Check that the person to which an email address is linked has the same account as that email address.';
-
-CREATE OR REPLACE FUNCTION check_person_email_address_account(
-    person integer, account integer)
-    RETURNS boolean
-    LANGUAGE plpythonu IMMUTABLE RETURNS NULL ON NULL INPUT AS
-$$
-    # It's possible for a Person to be created without an account. If
-    # that happens, return True so that things don't break.
-    if account is None:
-        return True
-    email_address_accounts = plpy.execute("""
-        SELECT account FROM EmailAddress WHERE
-            person = %s AND account IS NOT NULL""" % person)
-    # If there are no email address accounts to check, we're done.
-    if email_address_accounts.nrows() == 0:
-        return True
-    for email_account_row in email_address_accounts:
-        email_account = email_account_row['account']
-        if email_account is not None and email_account != account:
-            return False
-    return True
-$$;
-
-COMMENT ON FUNCTION check_person_email_address_account(integer, integer) IS
-'Check that the email addresses linked to a person have the same account ID as that person.';
-
-ALTER TABLE EmailAddress ADD CONSTRAINT valid_account_for_person
-    CHECK (check_email_address_person_account(person, account));
-ALTER TABLE Person ADD CONSTRAINT valid_account_for_emailaddresses
-    CHECK (check_person_email_address_account(id, account));
-
-INSERT INTO LaunchpadDatabaseRevision VALUES (2209, 00, 4);

=== removed symlink 'lib/canonical/config/__init__.py'
=== target was u'../../lp/services/config/__init__.py'
=== removed directory 'lib/canonical/database'
=== removed file 'lib/canonical/database/__init__.py'
=== removed file 'lib/canonical/database/postgresql.py'
--- lib/canonical/database/postgresql.py	2012-01-09 13:42:03 +0000
+++ lib/canonical/database/postgresql.py	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Temporary shim for fti.py.
-
-__all__ = [
-    'ConnectionString',
-    ]
-
-from lp.services.database.postgresql import ConnectionString

=== removed file 'lib/canonical/database/sqlbase.py'
--- lib/canonical/database/sqlbase.py	2012-01-09 13:42:03 +0000
+++ lib/canonical/database/sqlbase.py	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-# Copyright 2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# Temporary shim for fti.py.
-
-__all__ = [
-    'connect',
-    'ISOLATION_LEVEL_AUTOCOMMIT',
-    'ISOLATION_LEVEL_READ_COMMITTED',
-    'quote',
-    'quote_identifier',
-    ]
-
-from lp.services.database.sqlbase import (
-    connect,
-    ISOLATION_LEVEL_AUTOCOMMIT,
-    ISOLATION_LEVEL_READ_COMMITTED,
-    quote,
-    quote_identifier,
-    )

=== removed directory 'lib/canonical/launchpad/scripts'
=== removed file 'lib/canonical/launchpad/scripts/__init__.py'
--- lib/canonical/launchpad/scripts/__init__.py	2012-01-09 13:42:03 +0000
+++ lib/canonical/launchpad/scripts/__init__.py	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-# This is a temporary shim to support database/schema/fti.py in devel.
-
-__all__ = [
-    'db_options',
-    'logger',
-    'logger_options',
-    ]
-
-from lp.services.scripts import (
-    db_options,
-    logger,
-    logger_options,
-    )

=== modified file 'lib/lp/answers/browser/faq.py'
--- lib/lp/answers/browser/faq.py	2012-01-09 13:42:03 +0000
+++ lib/lp/answers/browser/faq.py	2012-01-05 20:11:40 +0000
@@ -12,18 +12,10 @@
     'FAQView',
     ]
 
-<<<<<<< TREE
 from lp import _
 from lp.answers.interfaces.faq import IFAQ
 from lp.answers.interfaces.faqcollection import IFAQCollection
 from lp.app.browser.launchpadform import (
-=======
-from lp import _
-from lp.answers.browser.faqcollection import FAQCollectionMenu
-from lp.answers.interfaces.faq import IFAQ
-from lp.answers.interfaces.faqcollection import IFAQCollection
-from lp.services.webapp import (
->>>>>>> MERGE-SOURCE
     action,
     LaunchpadEditFormView,
     )
@@ -33,12 +25,8 @@
     Link,
     NavigationMenu,
     )
-<<<<<<< TREE
 from lp.services.webapp.breadcrumb import Breadcrumb
 from lp.services.webapp.publisher import LaunchpadView
-=======
-from lp.services.webapp.breadcrumb import Breadcrumb
->>>>>>> MERGE-SOURCE
 
 
 class FAQNavigationMenu(NavigationMenu):

=== modified file 'lib/lp/app/browser/tests/test_launchpadform_doc.py'
--- lib/lp/app/browser/tests/test_launchpadform_doc.py	2012-01-09 13:42:03 +0000
+++ lib/lp/app/browser/tests/test_launchpadform_doc.py	2012-01-06 01:29:22 +0000
@@ -95,11 +95,7 @@
 
         >>> from zope.app.form.interfaces import IDisplayWidget, IInputWidget
         >>> from zope.interface import directlyProvides, implements
-<<<<<<< TREE
         >>> from lp.app.browser.launchpadform import (
-=======
-        >>> from lp.services.webapp import (
->>>>>>> MERGE-SOURCE
         ...     LaunchpadFormView, custom_widget)
         >>> from zope.schema import Bool
         >>> from zope.publisher.browser import TestRequest

=== modified file 'lib/lp/app/doc/launchpadform.txt'
--- lib/lp/app/doc/launchpadform.txt	2012-01-09 13:42:03 +0000
+++ lib/lp/app/doc/launchpadform.txt	2012-01-06 11:08:30 +0000
@@ -131,11 +131,7 @@
 attribute:
 
   >>> from zope.app.form.browser import TextWidget
-<<<<<<< TREE
   >>> from lp.app.browser.launchpadform import custom_widget
-=======
-  >>> from lp.services.webapp import custom_widget
->>>>>>> MERGE-SOURCE
   >>> from lp.app.widgets.password import PasswordChangeWidget
 
   >>> class FormTestView3(LaunchpadFormView):
@@ -179,11 +175,7 @@
 submit actions.  These are added to the view class using the "action"
 decorator:
 
-<<<<<<< TREE
   >>> from lp.app.browser.launchpadform import action
-=======
-  >>> from lp.services.webapp import action
->>>>>>> MERGE-SOURCE
   >>> class FormTestView4(LaunchpadFormView):
   ...     schema = IFormTest
   ...     field_names = ['displayname']
@@ -536,11 +528,7 @@
 However, there are cases where a form action is safe (e.g. a "search"
 action).  Those actions can be marked as such:
 
-<<<<<<< TREE
   >>> from lp.app.browser.launchpadform import safe_action
-=======
-  >>> from lp.services.webapp import safe_action
->>>>>>> MERGE-SOURCE
   >>> class UnsafeActionTestView(LaunchpadFormView):
   ...     schema = IFormTest
   ...     field_names = ['name']
@@ -600,11 +588,7 @@
 
 In other respects, it is used the same way as LaunchpadFormView:
 
-<<<<<<< TREE
   >>> from lp.app.browser.launchpadform import LaunchpadEditFormView
-=======
-  >>> from lp.services.webapp import LaunchpadEditFormView
->>>>>>> MERGE-SOURCE
   >>> class FormTestView8(LaunchpadEditFormView):
   ...     schema = IFormTest
   ...     field_names = ['displayname']

=== renamed directory 'lib/lp/app/javascript/inlinehelp.moved' => 'lib/lp/app/javascript/inlinehelp'
=== removed symlink 'lib/lp/app/javascript/inlinehelp'
=== target was u'../../../lp/services/inlinehelp/javascript'
=== modified file 'lib/lp/app/javascript/listing_navigator.js'
--- lib/lp/app/javascript/listing_navigator.js	2012-01-09 13:42:03 +0000
+++ lib/lp/app/javascript/listing_navigator.js	2012-01-06 13:17:34 +0000
@@ -17,7 +17,6 @@
 }
 
 /**
-<<<<<<< TREE
  * If there is no context (say /bugs/+bugs) we need to generate a weblink for
  * the lp.client to use for things. This is a helper to take the current url
  * and try to generate a likely web_link value to build a url off of.
@@ -33,9 +32,6 @@
 
 /**
  * Constructor.
-=======
- * Constructor.
->>>>>>> MERGE-SOURCE
  * cache is the JSONRequestCache for the batch.
  * template is the template to use for rendering batches.
  * target is a YUI node to update when rendering batches.

=== modified file 'lib/lp/app/javascript/tests/test_listing_navigator.js'
--- lib/lp/app/javascript/tests/test_listing_navigator.js	2012-01-09 13:42:03 +0000
+++ lib/lp/app/javascript/tests/test_listing_navigator.js	2012-01-06 13:17:34 +0000
@@ -623,7 +623,6 @@
         navigator.prev_batch();
         Y.Assert.areSame(
             null, navigator.get('io_provider').last_request);
-<<<<<<< TREE
     },
 
     /**
@@ -652,12 +651,6 @@
 }));
 
 suite.add(new Y.Test.Case({
-=======
-    }
-}));
-
-suite.add(new Y.Test.Case({
->>>>>>> MERGE-SOURCE
     name: "pre-fetching batches",
     setUp: function() {
         this.target = Y.Node.create('<div></div>').set(

=== modified file 'lib/lp/archivepublisher/scripts/generate_extra_overrides.py'
--- lib/lp/archivepublisher/scripts/generate_extra_overrides.py	2012-01-09 13:42:03 +0000
+++ lib/lp/archivepublisher/scripts/generate_extra_overrides.py	2012-01-03 17:08:40 +0000
@@ -17,14 +17,10 @@
 from germinate.archive import TagFile
 from germinate.germinator import Germinator
 from germinate.log import GerminateFormatter
-<<<<<<< TREE
 from germinate.seeds import (
     SeedError,
     SeedStructure,
     )
-=======
-from germinate.seeds import SeedStructure
->>>>>>> MERGE-SOURCE
 from zope.component import getUtility
 
 from lp.archivepublisher.config import getPubConfig

=== modified file 'lib/lp/archiveuploader/dscfile.py'
--- lib/lp/archiveuploader/dscfile.py	2012-01-09 13:42:03 +0000
+++ lib/lp/archiveuploader/dscfile.py	2012-01-06 11:08:30 +0000
@@ -1,8 +1,4 @@
-<<<<<<< TREE
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-=======
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
->>>>>>> MERGE-SOURCE
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """ DSCFile and related.

=== modified file 'lib/lp/archiveuploader/tests/test_uploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_uploadprocessor.py	2012-01-09 13:42:03 +0000
+++ lib/lp/archiveuploader/tests/test_uploadprocessor.py	2012-01-03 12:11:57 +0000
@@ -629,7 +629,8 @@
         from_addr, to_addrs, raw_msg = stub.test_emails.pop()
         foo_bar = "Foo Bar <[e-mail]>"
         daniel = "Daniel Silverstone <[e-mail]>"
-        self.assertEqual([e.strip() for e in to_addrs], [foo_bar, daniel])
+        self.assertContentEqual(
+            [foo_bar, daniel], [e.strip() for e in to_addrs])
         self.assertTrue(
             "NEW" in raw_msg, "Expected email containing 'NEW', got:\n%s"
             % raw_msg)
@@ -663,7 +664,8 @@
         from_addr, to_addrs, raw_msg = stub.test_emails.pop()
         daniel = "Daniel Silverstone <[e-mail]>"
         foo_bar = "Foo Bar <[e-mail]>"
-        self.assertEqual([e.strip() for e in to_addrs], [foo_bar, daniel])
+        self.assertContentEqual(
+            [foo_bar, daniel], [e.strip() for e in to_addrs])
         self.assertTrue("Waiting for approval" in raw_msg,
                         "Expected an 'upload awaits approval' email.\n"
                         "Got:\n%s" % raw_msg)

=== modified file 'lib/lp/bugs/browser/bugattachment.py'
--- lib/lp/bugs/browser/bugattachment.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/browser/bugattachment.py	2012-01-05 20:11:40 +0000
@@ -33,40 +33,21 @@
     IBugAttachmentIsPatchConfirmationForm,
     IBugAttachmentSet,
     )
-<<<<<<< TREE
-from lp.services.librarian.browser import (
-    FileNavigationMixin,
-    ProxiedLibraryFileAlias,
-    )
-from lp.services.librarian.interfaces import ILibraryFileAliasWithParent
-from lp.services.webapp import (
-    canonical_url,
-    GetitemNavigation,
-    Navigation,
-    )
-from lp.services.webapp.interfaces import (
-    ICanonicalUrlData,
-    ILaunchBag,
-    )
-from lp.services.webapp.menu import structured
-=======
-from lp.services.librarian.browser import (
-    FileNavigationMixin,
-    ProxiedLibraryFileAlias,
-    )
-from lp.services.librarian.interfaces import ILibraryFileAliasWithParent
-from lp.services.webapp import (
-    canonical_url,
-    custom_widget,
-    GetitemNavigation,
-    Navigation,
-    )
-from lp.services.webapp.interfaces import (
-    ICanonicalUrlData,
-    ILaunchBag,
-    )
-from lp.services.webapp.menu import structured
->>>>>>> MERGE-SOURCE
+from lp.services.librarian.browser import (
+    FileNavigationMixin,
+    ProxiedLibraryFileAlias,
+    )
+from lp.services.librarian.interfaces import ILibraryFileAliasWithParent
+from lp.services.webapp import (
+    canonical_url,
+    GetitemNavigation,
+    Navigation,
+    )
+from lp.services.webapp.interfaces import (
+    ICanonicalUrlData,
+    ILaunchBag,
+    )
+from lp.services.webapp.menu import structured
 
 
 class BugAttachmentContentCheck:

=== modified file 'lib/lp/bugs/browser/bugsubscription.py'
--- lib/lp/bugs/browser/bugsubscription.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/browser/bugsubscription.py	2012-01-05 20:11:40 +0000
@@ -48,7 +48,6 @@
     get_structural_subscriptions_for_bug,
     )
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
 from lp.services.webapp import (
     canonical_url,
     LaunchpadView,
@@ -59,18 +58,6 @@
     )
 from lp.app.browser.launchpadform import ReturnToReferrerMixin
 from lp.services.webapp.menu import structured
-=======
-from lp.services.webapp import (
-    canonical_url,
-    LaunchpadView,
-    )
-from lp.services.webapp.authorization import (
-    check_permission,
-    precache_permission_for_objects,
-    )
-from lp.services.webapp.launchpadform import ReturnToReferrerMixin
-from lp.services.webapp.menu import structured
->>>>>>> MERGE-SOURCE
 
 
 class BugSubscriptionAddView(LaunchpadFormView):

=== modified file 'lib/lp/bugs/browser/bugsupervisor.py'
--- lib/lp/bugs/browser/bugsupervisor.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/browser/bugsupervisor.py	2012-01-05 20:11:40 +0000
@@ -12,15 +12,9 @@
 from lazr.restful.interface import copy_field
 from zope.interface import Interface
 
-<<<<<<< TREE
 from lp.bugs.browser.bugrole import BugRoleMixin
 from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
 from lp.app.browser.launchpadform import (
-=======
-from lp.bugs.browser.bugrole import BugRoleMixin
-from lp.bugs.interfaces.bugsupervisor import IHasBugSupervisor
-from lp.services.webapp.launchpadform import (
->>>>>>> MERGE-SOURCE
     action,
     LaunchpadEditFormView,
     )

=== modified file 'lib/lp/bugs/browser/bugtask.py'
--- lib/lp/bugs/browser/bugtask.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/browser/bugtask.py	2012-01-09 13:42:13 +0000
@@ -3504,7 +3504,7 @@
               IDistributionSourcePackage.providedBy(self.context)):
             search_params.setSourcePackage(self.context)
         else:
-            raise AssertionError('Uknown context type: %s' % self.context)
+            raise AssertionError('Unknown context type: %s' % self.context)
 
         return u"".join("%d\n" % bug_id for bug_id in
             getUtility(IBugTaskSet).searchBugIds(search_params))

=== modified file 'lib/lp/bugs/browser/tests/test_bugs.py'
--- lib/lp/bugs/browser/tests/test_bugs.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/browser/tests/test_bugs.py	2012-01-05 18:12:05 +0000
@@ -10,7 +10,6 @@
 
 from lp.bugs.interfaces.malone import IMaloneApplication
 from lp.bugs.publisher import BugsLayer
-from lp.services.webapp.publisher import canonical_url
 from lp.testing import (
     set_feature_flag,
     feature_flags,

=== modified file 'lib/lp/bugs/interfaces/bugtask.py'
--- lib/lp/bugs/interfaces/bugtask.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/interfaces/bugtask.py	2012-01-09 13:42:13 +0000
@@ -1188,9 +1188,9 @@
 
     def __init__(self, user, bug=None, searchtext=None, fast_searchtext=None,
                  status=None, importance=None, milestone=None,
-                 assignee=None, sourcepackagename=None, owner=None,
-                 attachmenttype=None, orderby=None, omit_dupes=False,
-                 subscriber=None, component=None,
+                 milestone_tag=None, assignee=None, sourcepackagename=None,
+                 owner=None, attachmenttype=None, orderby=None,
+                 omit_dupes=False, subscriber=None, component=None,
                  pending_bugwatch_elsewhere=False, resolved_upstream=False,
                  open_upstream=False, has_no_upstream_bugtask=False, tag=None,
                  has_cve=False, bug_supervisor=None, bug_reporter=None,
@@ -1213,6 +1213,7 @@
         self.status = status
         self.importance = importance
         self.milestone = milestone
+        self.milestone_tag = milestone_tag
         self.assignee = assignee
         self.sourcepackagename = sourcepackagename
         self.owner = owner

=== modified file 'lib/lp/bugs/javascript/buglisting.js'
--- lib/lp/bugs/javascript/buglisting.js	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/javascript/buglisting.js	2011-12-23 16:34:48 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 /* Copyright 2011 Canonical Ltd.  This software is licensed under the
  * GNU Affero General Public License version 3 (see the file LICENSE).
  *
@@ -227,233 +226,3 @@
     "requires": [
         "history", "node", 'lp.app.listing_navigator', 'lp.app.inlinehelp']
 });
-=======
-/* Copyright 2011 Canonical Ltd.  This software is licensed under the
- * GNU Affero General Public License version 3 (see the file LICENSE).
- *
- * Client-side rendering of bug listings.
- *
- * @module bugs
- * @submodule buglisting
- */
-
-YUI.add('lp.bugs.buglisting', function(Y) {
-
-var module = Y.namespace('lp.bugs.buglisting');
-
-
-/**
- * Constructor.
- *
- * This is the model of the current batch, including the ordering, position,
- * and what fields are visibile.
- *
- * These values are stored in the History object, so that the browser
- * back/next buttons correctly adjust.  The system defaults for field
- * visibility are fixed, so they are stored directly on the object.
- *
- * Accepts a config containing:
- *  - field_visibility the requested field visibility as an associative array
- *  - field_visibility_defaults the system defaults for field visibility as an
- *    associative array.
- *  - batch_key: A string representing the position and ordering of the
- *    current batch, as returned by listing_navigator.get_batch_key
- */
-module.BugListingModel = function() {
-    module.BugListingModel.superclass.constructor.apply(this, arguments);
-};
-
-
-module.BugListingModel.NAME = 'buglisting-model';
-
-
-module.BugListingModel.ATTRS = {
-    field_visibility_defaults: {
-        value: null
-    }
-};
-
-
-Y.extend(module.BugListingModel, Y.Base, {
-    /**
-     * Initializer sets up the History object that stores most of the model
-     * data.
-     */
-    initializer: function(config) {
-        this.set('history', new Y.History({
-            initialState: Y.merge(
-                config.field_visibility, {batch_key: config.batch_key})
-        }));
-    },
-
-    /**
-     * Return the current field visibility, as an associative array.
-     * Since the history contains field values that are not field-visibility,
-     * use field_visibility_defaults to filter out non-field-visibility
-     * values.
-     */
-    get_field_visibility: function() {
-        var result = this.get('history').get();
-        var key_source = this.get('field_visibility_defaults');
-        Y.each(result, function(value, key) {
-            if (!key_source.hasOwnProperty(key)){
-                delete result[key];
-            }
-        });
-        return result;
-    },
-
-    /**
-     * Set the field visibility, updating history.  Accepts an associative
-     * array.
-     */
-    set_field_visibility: function(value) {
-        this.get('history').add(value);
-    },
-
-    /**
-     * Return the current batch key.
-     */
-    get_batch_key: function() {
-        return this.get('history').get('batch_key');
-    },
-
-    /**
-     * Set the current batch.  The batch_key and the query mapping identifying
-     * the batch must be supplied.
-     */
-    set_batch: function(batch_key, query) {
-        var url = '?' + Y.QueryString.stringify(query);
-        this.get('history').addValue('batch_key', batch_key, {url: url});
-    }
-});
-
-
-/**
- * Constructor.
- * current_url is used to determine search params.
- * cache is the JSONRequestCache for the batch.
- * template is the template to use for rendering batches.
- * target is a YUI node to update when rendering batches.
- * navigation_indices is a YUI NodeList of nodes to update with the current
- * batch info.
- * io_provider is something providing the Y.io interface, typically used for
- * testing.  Defaults to Y.io.
- */
-module.BugListingNavigator = function(config) {
-    module.BugListingNavigator.superclass.constructor.apply(
-        this, arguments);
-};
-
-module.BugListingNavigator.ATTRS = {
-};
-
-Y.extend(
-    module.BugListingNavigator,
-    Y.lp.app.listing_navigator.ListingNavigator, {
-    _bindUI: function () {
-        initInlineHelp();
-    },
-
-    initializer: function(config) {
-        this.get('model').get('history').after(
-            'change', this.history_changed, this);
-    },
-    /**
-     * Event handler for history:change events.
-     */
-    history_changed: function(e) {
-        if (e.newVal.hasOwnProperty('batch_key')) {
-            var batch_key = e.newVal.batch_key;
-            var batch = this.get('batches')[batch_key];
-            this.pre_fetch_batches();
-            this.render();
-            this._bindUI();
-        }
-        else {
-            // Handle Chrom(e|ium)'s initial popstate.
-            this.get('model').get('history').replace(e.prevVal);
-        }
-    },
-
-    /**
-     * Return the model to use for rendering the batch.  This will include
-     * updates to field visibility.
-     */
-    get_render_model: function(current_batch) {
-        return Y.merge(
-            current_batch.mustache_model,
-            this.get('model').get_field_visibility());
-    },
-
-    /**
-     * Handle a previously-unseen batch by storing it in the cache and
-     * stripping out field_visibility values that would otherwise shadow the
-     * real values.
-     */
-    handle_new_batch: function(batch) {
-        var key, i;
-        Y.each(batch.field_visibility, function(value, key) {
-            for (i = 0; i < batch.mustache_model.items.length; i++) {
-                delete batch.mustache_model.items[i][key];
-            }
-        });
-        return this.constructor.superclass.handle_new_batch.call(this, batch);
-    }
-
-},{
-    make_model: function(batch_key, cache) {
-        return new module.BugListingModel({
-                batch_key: batch_key,
-                field_visibility: cache.field_visibility,
-                field_visibility_defaults: cache.field_visibility_defaults
-        });
-    },
-    get_search_params: function(config) {
-        var search_params = Y.lp.app.listing_navigator.get_query(
-            config.current_url);
-        delete search_params.start;
-        delete search_params.memo;
-        delete search_params.direction;
-        delete search_params.orderby;
-        return search_params;
-    }
-});
-
-/**
- * Factory to return a BugListingNavigator for the given page.
- */
-module.BugListingNavigator.from_page = function() {
-    var target = Y.one('#client-listing');
-    if (Y.Lang.isNull(target)){
-        return null;
-    }
-    var navigation_indices = Y.all('.batch-navigation-index');
-    var pre_fetch = Y.lp.app.listing_navigator.get_feature_flag(
-        'bugs.dynamic_bug_listings.pre_fetch');
-    Y.lp.app.listing_navigator.linkify_navigation();
-    var navigator = new module.BugListingNavigator({
-        current_url: window.location,
-        cache: LP.cache,
-        template: LP.mustache_listings,
-        target: target,
-        navigation_indices: navigation_indices,
-        pre_fetch: Boolean(pre_fetch)
-    });
-    navigator.set('backwards_navigation', Y.all('.first,.previous'));
-    navigator.set('forwards_navigation', Y.all('.last,.next'));
-    navigator.clickAction('.first', navigator.first_batch);
-    navigator.clickAction('.next', navigator.next_batch);
-    navigator.clickAction('.previous', navigator.prev_batch);
-    navigator.clickAction('.last', navigator.last_batch);
-    navigator.render_navigation();
-    return navigator;
-};
-
-
-
-}, "0.1", {
-    "requires": [
-        "history", "node", 'lp.app.listing_navigator']
-});
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/bugs/javascript/tests/test_buglisting.html'
--- lib/lp/bugs/javascript/tests/test_buglisting.html	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/javascript/tests/test_buglisting.html	2012-01-05 21:13:29 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 <html>
   <head>
   <title>Bug task listing</title>
@@ -54,65 +53,3 @@
       <div id="fixture"></div>
   </body>
 </html>
-=======
-<html>
-  <head>
-  <title>Bug task listing</title>
-  <script type="text/javascript">
-      // this is a fake out of the global help overlay tool we need to call
-      var initInlineHelp = function () {
-          return;
-      };
-  </script>
-
-  <!-- YUI and test setup -->
-  <script type="text/javascript"
-          src="../../../../canonical/launchpad/icing/yui/yui/yui.js">
-  </script>
-  <link rel="stylesheet" href="../../../app/javascript/testing/test.css" />
-  <script type="text/javascript"
-          src="../../../app/javascript/testing/testrunner.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/testing/assert.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/testing/mockio.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/client.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/effects/effects.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/errors.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/expander.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/formoverlay/formoverlay.js"></script>
-  <script type="text/javascript"
-          src="../../../app/javascript/lp.js"></script>
-
-    <script type="text/javascript"
-      src="../../../contrib/javascript/mustache.js"></script>
-  <script type="text/javascript"
-      src="../../../app/javascript/overlay/overlay.js"></script>
-  <script type="text/javascript"
-      src="../../../app/javascript/indicator/indicator.js"></script>
-    <script type="text/javascript"
-      src="../../../app/javascript/listing_navigator.js"></script>
-
-    <!-- The module under test -->
-    <script type="text/javascript"
-      src="../buglisting.js"></script>
-
-    <!-- The test suite -->
-    <script type="text/javascript"
-      src="test_buglisting.js"></script>
-
-    <!-- Pretty up the sample html -->
-    <style type="text/css">
-      div#sample {margin:15px; width:200px; border:1px solid #999; padding:10px;}
-    </style>
-  </head>
-  <body class="yui3-skin-sam">
-      <div id="fixture"></div>
-  </body>
-</html>
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/bugs/javascript/tests/test_buglisting.js'
--- lib/lp/bugs/javascript/tests/test_buglisting.js	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/javascript/tests/test_buglisting.js	2012-01-05 21:13:29 +0000
@@ -1,4 +1,3 @@
-<<<<<<< TREE
 YUI({
     base: '../../../../canonical/launchpad/icing/yui/',
     filter: 'raw', combine: false, fetchCSS: false
@@ -241,247 +240,3 @@
     Y.Test.Runner.run();
 });
 });
-=======
-YUI({
-    base: '../../../../canonical/launchpad/icing/yui/',
-    filter: 'raw', combine: false, fetchCSS: false
-    }).use('test', 'console', 'lp.bugs.buglisting', 'lp.testing.mockio',
-           'lp.testing.assert',
-           function(Y) {
-
-var suite = new Y.Test.Suite("lp.bugs.buglisting Tests");
-var module = Y.lp.bugs.buglisting;
-
-
-suite.add(new Y.Test.Case({
-    name: 'ListingNavigator',
-    setUp: function() {
-        this.target = Y.Node.create('<div></div>').set(
-            'id', 'client-listing');
-        Y.one('body').appendChild(this.target);
-    },
-    tearDown: function() {
-        this.target.remove();
-        delete this.target;
-    },
-    test_sets_search_params: function() {
-        // search_parms includes all query values that don't control batching
-        var navigator = new module.BugListingNavigator({
-            current_url: 'http://yahoo.com?foo=bar&start=1&memo=2&' +
-                'direction=3&orderby=4',
-            cache: {next: null, prev: null},
-            target: this.target
-        });
-        Y.lp.testing.assert.assert_equal_structure(
-            {foo: 'bar'}, navigator.get('search_params'));
-    },
-    test_cleans_visibility_from_current_batch: function() {
-        // When initial batch is handled, field visibility is stripped.
-        var navigator = new module.BugListingNavigator({
-            current_url: '',
-            cache: {
-                field_visibility: {show_item: true},
-                mustache_model: {items: [{show_item: true} ] },
-                next: null,
-                prev: null
-            },
-            target: this.target
-        });
-        bugtask = navigator.get_current_batch().mustache_model.items[0];
-        Y.Assert.isFalse(bugtask.hasOwnProperty('show_item'));
-    },
-    test_cleans_visibility_from_new_batch: function() {
-        // When new batch is handled, field visibility is stripped.
-        var bugtask;
-        var model = {
-            mustache_model: {items: []},
-            memo: 1,
-            next: null,
-            prev: null,
-            field_visibility: {},
-            field_visibility_defaults: {show_item: true}
-        };
-        var navigator = new module.BugListingNavigator({
-            current_url: '',
-            cache: model,
-            template: '',
-            target: this.target
-        });
-        var batch = {
-            mustache_model: {
-                items: [{show_item: true}]},
-            memo: 2,
-            next: null,
-            prev: null,
-            field_visibility: {show_item: true}
-        };
-        var query = navigator.get_batch_query(batch);
-        navigator.update_from_new_model(query, false, batch);
-        bugtask = navigator.get_current_batch().mustache_model.items[0];
-        Y.Assert.isFalse(bugtask.hasOwnProperty('show_item'));
-    }
-}));
-
-
-var get_navigator = function(url, config) {
-    var mock_io = new Y.lp.testing.mockio.MockIo();
-    if (Y.Lang.isUndefined(url)){
-        url = '';
-    }
-    if (Y.Lang.isUndefined(config)){
-        config = {};
-    }
-    var target = config.target;
-    if (!Y.Lang.isValue(target)){
-        var target_parent = Y.Node.create('<div></div>');
-        target = Y.Node.create('<div "id=#client-listing"></div>');
-        target_parent.appendChild(target);
-    }
-    lp_cache = {
-        context: {
-            resource_type_link: 'http://foo_type',
-            web_link: 'http://foo/bar'
-        },
-        view_name: '+bugs',
-        next: {
-            memo: 467,
-            start: 500
-        },
-        prev: {
-            memo: 457,
-            start: 400
-        },
-        forwards: true,
-        order_by: 'foo',
-        memo: 457,
-        start: 450,
-        last_start: 23,
-        field_visibility: {},
-        field_visibility_defaults: {}
-    };
-    if (config.no_next){
-        lp_cache.next = null;
-    }
-    if (config.no_prev){
-        lp_cache.prev = null;
-    }
-    var navigator_config = {
-        current_url: url,
-        cache: lp_cache,
-        io_provider: mock_io,
-        pre_fetch: config.pre_fetch,
-        target: target,
-        template: ''
-    };
-    return new module.BugListingNavigator(navigator_config);
-};
-
-suite.add(new Y.Test.Case({
-    name: 'browser history',
-
-    setUp: function() {
-        this.target = Y.Node.create('<div></div>').set(
-            'id', 'client-listing');
-        Y.one('body').appendChild(this.target);
-    },
-
-    tearDown: function() {
-        this.target.remove();
-        delete this.target;
-    },
-
-    /**
-     * Update from cache generates a change event for the specified batch.
-     */
-    test_update_from_cache_generates_event: function() {
-        var navigator = get_navigator('', {target: this.target});
-        var e = null;
-        navigator.get('model').get('history').on('change', function(inner_e) {
-            e = inner_e;
-        });
-        navigator.get('batches')['some-batch-key'] = {
-            mustache_model: {
-                items: []
-            },
-            next: null,
-            prev: null
-        };
-        navigator.update_from_cache({foo: 'bar'}, 'some-batch-key');
-        Y.Assert.areEqual('some-batch-key', e.newVal.batch_key);
-        Y.Assert.areEqual('?foo=bar', e._options.url);
-    },
-
-    /**
-     * When a change event is emitted, the relevant batch becomes the current
-     * batch and is rendered.
-     */
-    test_change_event_renders_cache: function() {
-        var navigator = get_navigator('', {target: this.target});
-        var batch = {
-            mustache_model: {
-                items: [],
-                foo: 'bar'
-            },
-            next: null,
-            prev: null
-        };
-        navigator.set('template', '{{foo}}');
-        navigator.get('batches')['some-batch-key'] = batch;
-        navigator.get('model').get('history').addValue(
-            'batch_key', 'some-batch-key');
-        Y.Assert.areEqual(batch, navigator.get_current_batch());
-        Y.Assert.areEqual('bar', navigator.get('target').getContent());
-    }
-}));
-
-suite.add(new Y.Test.Case({
-    name: 'from_page tests',
-    setUp: function() {
-        window.LP = {
-            cache: {
-                current_batch: {},
-                next: null,
-                prev: null,
-                related_features: {
-                    'bugs.dynamic_bug_listings.pre_fetch': {value: 'on'}
-                }
-            }
-        };
-    },
-    getPreviousLink: function() {
-        return Y.one('.previous').get('href');
-    },
-    test_from_page_with_client: function() {
-        Y.one('#fixture').setContent(
-            '<a class="previous" href="http://example.org/">PreVious</span>' +
-            '<div id="client-listing"></div>');
-        Y.Assert.areSame('http://example.org/', this.getPreviousLink());
-        module.BugListingNavigator.from_page();
-        Y.Assert.areNotSame('http://example.org/', this.getPreviousLink());
-    },
-    test_from_page_with_no_client: function() {
-        Y.one('#fixture').setContent('');
-        var navigator = module.BugListingNavigator.from_page();
-        Y.Assert.isNull(navigator);
-    },
-    tearDown: function() {
-        Y.one('#fixture').setContent("");
-        delete window.LP;
-    }
-}));
-
-
-var handle_complete = function(data) {
-    window.status = '::::' + JSON.stringify(data);
-    };
-Y.Test.Runner.on('complete', handle_complete);
-Y.Test.Runner.add(suite);
-
-var console = new Y.Console({newestOnTop: false});
-console.render('#log');
-
-Y.on('domready', function() {
-    Y.Test.Runner.run();
-});
-});
->>>>>>> MERGE-SOURCE

=== modified file 'lib/lp/bugs/model/bugtask.py'
--- lib/lp/bugs/model/bugtask.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/model/bugtask.py	2012-01-09 13:42:13 +0000
@@ -117,6 +117,7 @@
     IMilestoneSet,
     IProjectGroupMilestone,
     )
+from lp.registry.interfaces.milestonetag import IProjectGroupMilestoneTag
 from lp.registry.interfaces.person import (
     IPerson,
     validate_person,
@@ -2045,6 +2046,18 @@
         if params.status is not None:
             extra_clauses.append(self._buildStatusClause(params.status))
 
+        if params.exclude_conjoined_tasks:
+            # XXX: frankban 2012-01-05 bug=912370: excluding conjoined
+            # bugtasks is not currently supported for milestone tags.
+            if params.milestone_tag:
+                raise NotImplementedError(
+                    'Excluding conjoined tasks is not currently supported '
+                    'for milestone tags')
+            if not params.milestone:
+                raise ValueError(
+                    "BugTaskSearchParam.exclude_conjoined cannot be True if "
+                    "BugTaskSearchParam.milestone is not set")
+
         if params.milestone:
             if IProjectGroupMilestone.providedBy(params.milestone):
                 where_cond = """
@@ -2064,10 +2077,29 @@
                     params.milestone)
                 join_tables += tables
                 extra_clauses += clauses
-        elif params.exclude_conjoined_tasks:
-            raise ValueError(
-                "BugTaskSearchParam.exclude_conjoined cannot be True if "
-                "BugTaskSearchParam.milestone is not set")
+
+        if params.milestone_tag:
+            where_cond = """
+                IN (SELECT Milestone.id
+                    FROM Milestone, Product, MilestoneTag
+                    WHERE Milestone.product = Product.id
+                        AND Product.project = %s
+                        AND MilestoneTag.milestone = Milestone.id
+                        AND MilestoneTag.tag IN %s
+                    GROUP BY Milestone.id
+                    HAVING COUNT(Milestone.id) = %s)
+            """ % sqlvalues(params.milestone_tag.target,
+                            params.milestone_tag.tags,
+                            len(params.milestone_tag.tags))
+            extra_clauses.append("BugTask.milestone %s" % where_cond)
+
+            # XXX: frankban 2012-01-05 bug=912370: excluding conjoined
+            # bugtasks is not currently supported for milestone tags.
+            # if params.exclude_conjoined_tasks:
+            #     tables, clauses = self._buildExcludeConjoinedClause(
+            #         params.milestone_tag)
+            #     join_tables += tables
+            #     extra_clauses += clauses
 
         if params.project:
             # Prevent circular import problems.
@@ -2865,12 +2897,25 @@
             result[row[:-1]] = row[-1]
         return result
 
-    def getPrecachedNonConjoinedBugTasks(self, user, milestone):
+    def getPrecachedNonConjoinedBugTasks(self, user, milestone_data):
         """See `IBugTaskSet`."""
-        params = BugTaskSearchParams(
-            user, milestone=milestone,
-            orderby=['status', '-importance', 'id'],
-            omit_dupes=True, exclude_conjoined_tasks=True)
+        kwargs = {
+            'orderby': ['status', '-importance', 'id'],
+            'omit_dupes': True,
+            }
+        if IProjectGroupMilestoneTag.providedBy(milestone_data):
+            # XXX: frankban 2012-01-05 bug=912370: excluding conjoined
+            # bugtasks is not currently supported for milestone tags.
+            kwargs.update({
+                'exclude_conjoined_tasks': False,
+                'milestone_tag': milestone_data,
+                })
+        else:
+            kwargs.update({
+                'exclude_conjoined_tasks': True,
+                'milestone': milestone_data,
+                })
+        params = BugTaskSearchParams(user, **kwargs)
         return self.search(params)
 
     def createTask(self, bug, owner, target,

=== modified file 'lib/lp/bugs/tests/test_structuralsubscription.py'
--- lib/lp/bugs/tests/test_structuralsubscription.py	2012-01-09 13:42:03 +0000
+++ lib/lp/bugs/tests/test_structuralsubscription.py	2012-01-03 14:18:27 +0000
@@ -38,7 +38,6 @@
     TestCaseWithFactory,
     )
 from lp.testing.factory import is_security_proxied_or_harmless
-<<<<<<< TREE
 from lp.testing.layers import (
     DatabaseFunctionalLayer,
     LaunchpadFunctionalLayer,
@@ -46,12 +45,6 @@
 
 
 RESULT_SETS = ResultSet, EmptyResultSet, DecoratedResultSet
-=======
-from lp.testing.layers import (
-    DatabaseFunctionalLayer,
-    LaunchpadFunctionalLayer,
-    )
->>>>>>> MERGE-SOURCE
 
 
 class TestStructuralSubscription(TestCaseWithFactory):

=== modified file 'lib/lp/buildmaster/doc/buildqueue.txt'
--- lib/lp/buildmaster/doc/buildqueue.txt	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/doc/buildqueue.txt	2012-01-07 17:40:43 +0000
@@ -12,12 +12,8 @@
 As soon as a build job is processed succesfully (dispatched &
 collected) the BuildQueue record representing it is removed.
 
-<<<<<<< TREE
     >>> from lp.services.webapp.testing import verifyObject
     >>> from lp.services.propertycache import get_property_cache
-=======
-    >>> from lp.services.webapp.testing import verifyObject
->>>>>>> MERGE-SOURCE
     >>> from lp.buildmaster.interfaces.buildqueue import (
     ...     IBuildQueue, IBuildQueueSet)
 

=== modified file 'lib/lp/buildmaster/interfaces/builder.py'
--- lib/lp/buildmaster/interfaces/builder.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/interfaces/builder.py	2012-01-03 12:11:57 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -195,6 +195,8 @@
 
     def setSlaveForTesting(proxy):
         """Sets the RPC proxy through which to operate the build slave."""
+        # XXX JeroenVermeulen 2011-11-09, bug=888010: Don't use this.
+        # It's a trap.  See bug for details.
 
     def verifySlaveBuildCookie(slave_build_id):
         """Verify that a slave's build cookie is consistent.

=== modified file 'lib/lp/buildmaster/manager.py'
--- lib/lp/buildmaster/manager.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/manager.py	2012-01-06 15:24:37 +0000
@@ -1,8 +1,4 @@
-<<<<<<< TREE
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-=======
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
->>>>>>> MERGE-SOURCE
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Soyuz buildd slave manager logic."""
@@ -38,11 +34,8 @@
     BuildBehaviorMismatch,
     )
 from lp.buildmaster.model.builder import Builder
-<<<<<<< TREE
 from lp.services.propertycache import get_property_cache
 from lp.services.database.transaction_policy import DatabaseTransactionPolicy
-=======
->>>>>>> MERGE-SOURCE
 
 
 BUILDD_MANAGER_LOG_NAME = "slave-scanner"
@@ -124,13 +117,17 @@
     # algorithm for polling.
     SCAN_INTERVAL = 15
 
-    def __init__(self, builder_name, logger):
+    def __init__(self, builder_name, logger, clock=None):
         self.builder_name = builder_name
         self.logger = logger
+        if clock is None:
+            clock = reactor
+        self._clock = clock
 
     def startCycle(self):
         """Scan the builder and dispatch to it or deal with failures."""
         self.loop = LoopingCall(self.singleCycle)
+        self.loop.clock = self._clock
         self.stopping_deferred = self.loop.start(self.SCAN_INTERVAL)
         return self.stopping_deferred
 
@@ -151,51 +148,58 @@
         1. Print the error in the log
         2. Increment and assess failure counts on the builder and job.
         """
-        # Make sure that pending database updates are removed as it
-        # could leave the database in an inconsistent state (e.g. The
-        # job says it's running but the buildqueue has no builder set).
+        # Since this is a failure path, we could be in a broken
+        # transaction.  Get us a fresh one.
         transaction.abort()
 
         # If we don't recognise the exception include a stack trace with
         # the error.
         error_message = failure.getErrorMessage()
-        if failure.check(
+        familiar_error = failure.check(
             BuildSlaveFailure, CannotBuild, BuildBehaviorMismatch,
-            CannotResumeHost, BuildDaemonError, CannotFetchFile):
-            self.logger.info("Scanning %s failed with: %s" % (
-                self.builder_name, error_message))
+            CannotResumeHost, BuildDaemonError, CannotFetchFile)
+        if familiar_error:
+            self.logger.info(
+                "Scanning %s failed with: %s",
+                self.builder_name, error_message)
         else:
-            self.logger.info("Scanning %s failed with: %s\n%s" % (
+            self.logger.info(
+                "Scanning %s failed with: %s\n%s",
                 self.builder_name, failure.getErrorMessage(),
-                failure.getTraceback()))
+                failure.getTraceback())
 
         # Decide if we need to terminate the job or fail the
         # builder.
         try:
             builder = get_builder(self.builder_name)
-            builder.gotFailure()
-            if builder.currentjob is not None:
-                build_farm_job = builder.getCurrentBuildFarmJob()
-                build_farm_job.gotFailure()
-                self.logger.info(
-                    "builder %s failure count: %s, "
-                    "job '%s' failure count: %s" % (
+            transaction.commit()
+
+            with DatabaseTransactionPolicy(read_only=False):
+                builder.gotFailure()
+
+                if builder.currentjob is None:
+                    self.logger.info(
+                        "Builder %s failed a probe, count: %s",
+                        self.builder_name, builder.failure_count)
+                else:
+                    build_farm_job = builder.getCurrentBuildFarmJob()
+                    build_farm_job.gotFailure()
+                    self.logger.info(
+                        "builder %s failure count: %s, "
+                        "job '%s' failure count: %s",
                         self.builder_name,
                         builder.failure_count,
                         build_farm_job.title,
-                        build_farm_job.failure_count))
-            else:
-                self.logger.info(
-                    "Builder %s failed a probe, count: %s" % (
-                        self.builder_name, builder.failure_count))
-            assessFailureCounts(builder, failure.getErrorMessage())
-            transaction.commit()
+                        build_farm_job.failure_count)
+
+                assessFailureCounts(builder, failure.getErrorMessage())
+                transaction.commit()
         except:
             # Catastrophic code failure! Not much we can do.
+            transaction.abort()
             self.logger.error(
                 "Miserable failure when trying to examine failure counts:\n",
                 exc_info=True)
-            transaction.abort()
 
     def checkCancellation(self, builder):
         """See if there is a pending cancellation request.
@@ -250,14 +254,9 @@
         """
         # We need to re-fetch the builder object on each cycle as the
         # Storm store is invalidated over transaction boundaries.
-
         self.builder = get_builder(self.builder_name)
 
         def status_updated(ignored):
-            # Commit the changes done while possibly rescuing jobs, to
-            # avoid holding table locks.
-            transaction.commit()
-
             # See if we think there's an active build on the builder.
             buildqueue = self.builder.getBuildQueue()
 
@@ -267,14 +266,10 @@
                 return self.builder.updateBuild(buildqueue)
 
         def build_updated(ignored):
-            # Commit changes done while updating the build, to avoid
-            # holding table locks.
-            transaction.commit()
-
             # If the builder is in manual mode, don't dispatch anything.
             if self.builder.manual:
                 self.logger.debug(
-                    '%s is in manual mode, not dispatching.' %
+                    '%s is in manual mode, not dispatching.',
                     self.builder.name)
                 return
 
@@ -292,22 +287,33 @@
                 job = self.builder.currentjob
                 if job is not None and not self.builder.builderok:
                     self.logger.info(
-                        "%s was made unavailable, resetting attached "
-                        "job" % self.builder.name)
-                    job.reset()
+                        "%s was made unavailable; resetting attached job.",
+                        self.builder.name)
                     transaction.commit()
+                    with DatabaseTransactionPolicy(read_only=False):
+                        job.reset()
+                        transaction.commit()
                 return
 
             # See if there is a job we can dispatch to the builder slave.
 
+            # XXX JeroenVermeulen 2011-10-11, bug=872112: The job's
+            # failure count will be reset once the job has started
+            # successfully.  Because of intervening commits, you may see
+            # a build with a nonzero failure count that's actually going
+            # to succeed later (and have a failure count of zero).  Or
+            # it may fail yet end up with a lower failure count than you
+            # saw earlier.
             d = self.builder.findAndStartJob()
 
             def job_started(candidate):
                 if self.builder.currentjob is not None:
                     # After a successful dispatch we can reset the
                     # failure_count.
-                    self.builder.resetFailureCount()
                     transaction.commit()
+                    with DatabaseTransactionPolicy(read_only=False):
+                        self.builder.resetFailureCount()
+                        transaction.commit()
                     return self.builder.slave
                 else:
                     return None
@@ -386,6 +392,7 @@
         self.logger = self._setupLogger()
         self.new_builders_scanner = NewBuildersScanner(
             manager=self, clock=clock)
+        self.transaction_policy = DatabaseTransactionPolicy(read_only=True)
 
     def _setupLogger(self):
         """Set up a 'slave-scanner' logger that redirects to twisted.
@@ -404,16 +411,28 @@
         logger.setLevel(level)
         return logger
 
+    def enterReadOnlyDatabasePolicy(self):
+        """Set the database transaction policy to read-only.
+
+        Any previously pending changes are committed first.
+        """
+        transaction.commit()
+        self.transaction_policy.__enter__()
+
+    def exitReadOnlyDatabasePolicy(self, *args):
+        """Reset database transaction policy to the default read-write."""
+        self.transaction_policy.__exit__(None, None, None)
+
     def startService(self):
         """Service entry point, called when the application starts."""
+        # Avoiding circular imports.
+        from lp.buildmaster.interfaces.builder import IBuilderSet
+
+        self.enterReadOnlyDatabasePolicy()
 
         # Get a list of builders and set up scanners on each one.
-
-        # Avoiding circular imports.
-        from lp.buildmaster.interfaces.builder import IBuilderSet
-        builder_set = getUtility(IBuilderSet)
-        builders = [builder.name for builder in builder_set]
-        self.addScanForBuilders(builders)
+        self.addScanForBuilders(
+            [builder.name for builder in getUtility(IBuilderSet)])
         self.new_builders_scanner.scheduleScan()
 
         # Events will now fire in the SlaveScanner objects to scan each
@@ -434,6 +453,7 @@
         # stopped, so we can wait on them all at once here before
         # exiting.
         d = defer.DeferredList(deferreds, consumeErrors=True)
+        d.addCallback(self.exitReadOnlyDatabasePolicy)
         return d
 
     def addScanForBuilders(self, builders):

=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/model/builder.py	2012-01-07 17:40:43 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009,2011 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212
@@ -61,7 +61,6 @@
     specific_job_classes,
     )
 from lp.registry.interfaces.person import validate_public_person
-<<<<<<< TREE
 from lp.services.config import config
 from lp.services.database.sqlbase import (
     SQLBase,
@@ -69,14 +68,6 @@
     )
 from lp.services.database.transaction_policy import DatabaseTransactionPolicy
 from lp.services.helpers import filenameToContentType
-=======
-from lp.services.config import config
-from lp.services.database.sqlbase import (
-    SQLBase,
-    sqlvalues,
-    )
-from lp.services.helpers import filenameToContentType
->>>>>>> MERGE-SOURCE
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
 from lp.services.librarian.interfaces import ILibraryFileAliasSet
@@ -561,6 +552,8 @@
 
     def setSlaveForTesting(self, proxy):
         """See IBuilder."""
+        # XXX JeroenVermeulen 2011-11-09, bug=888010: Don't use this.
+        # It's a trap.  See bug for details.
         self._testing_slave = proxy
         del get_property_cache(self).slave
 
@@ -689,10 +682,13 @@
                 bytes_written = out_file.tell()
                 out_file.seek(0)
 
-                library_file = getUtility(ILibraryFileAliasSet).create(
-                    filename, bytes_written, out_file,
-                    contentType=filenameToContentType(filename),
-                    restricted=private)
+                transaction.commit()
+                with DatabaseTransactionPolicy(read_only=False):
+                    library_file = getUtility(ILibraryFileAliasSet).create(
+                        filename, bytes_written, out_file,
+                        contentType=filenameToContentType(filename),
+                        restricted=private)
+                    transaction.commit()
             finally:
                 # Remove the temporary file.  getFile() closes the file
                 # object.
@@ -730,7 +726,7 @@
     def acquireBuildCandidate(self):
         """Acquire a build candidate in an atomic fashion.
 
-        When retrieiving a candidate we need to mark it as building
+        When retrieving a candidate we need to mark it as building
         immediately so that it is not dispatched by another builder in the
         build manager.
 
@@ -740,12 +736,15 @@
         can be in this code at the same time.
 
         If there's ever more than one build manager running at once, then
-        this code will need some sort of mutex.
+        this code will need some sort of mutex, or run in a single
+        transaction.
         """
         candidate = self._findBuildCandidate()
         if candidate is not None:
-            candidate.markAsBuilding(self)
             transaction.commit()
+            with DatabaseTransactionPolicy(read_only=False):
+                candidate.markAsBuilding(self)
+                transaction.commit()
         return candidate
 
     def _findBuildCandidate(self):
@@ -808,13 +807,17 @@
         store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
         candidate_jobs = store.execute(query).get_all()
 
-        for (candidate_id,) in candidate_jobs:
-            candidate = getUtility(IBuildQueueSet).get(candidate_id)
-            job_class = job_classes[candidate.job_type]
-            candidate_approved = job_class.postprocessCandidate(
-                candidate, logger)
-            if candidate_approved:
-                return candidate
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            for (candidate_id,) in candidate_jobs:
+                candidate = getUtility(IBuildQueueSet).get(candidate_id)
+                job_class = job_classes[candidate.job_type]
+                candidate_approved = job_class.postprocessCandidate(
+                    candidate, logger)
+                if candidate_approved:
+                    transaction.commit()
+                    return candidate
+            transaction.commit()
 
         return None
 

=== modified file 'lib/lp/buildmaster/model/buildfarmjobbehavior.py'
--- lib/lp/buildmaster/model/buildfarmjobbehavior.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/model/buildfarmjobbehavior.py	2012-01-03 12:11:57 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -16,6 +16,7 @@
 import socket
 import xmlrpclib
 
+import transaction
 from twisted.internet import defer
 from zope.component import getUtility
 from zope.interface import implements
@@ -30,6 +31,7 @@
     IBuildFarmJobBehavior,
     )
 from lp.services import encoding
+from lp.services.database.transaction_policy import DatabaseTransactionPolicy
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.librarian.interfaces.client import ILibrarianClient
 
@@ -69,6 +71,25 @@
         if slave_build_cookie != expected_cookie:
             raise CorruptBuildCookie("Invalid slave build cookie.")
 
+    def _getBuilderStatusHandler(self, status_text, logger):
+        """Look up the handler method for a given builder status.
+
+        If status is not a known one, logs an error and returns None.
+        """
+        builder_status_handlers = {
+            'BuilderStatus.IDLE': self.updateBuild_IDLE,
+            'BuilderStatus.BUILDING': self.updateBuild_BUILDING,
+            'BuilderStatus.ABORTING': self.updateBuild_ABORTING,
+            'BuilderStatus.ABORTED': self.updateBuild_ABORTED,
+            'BuilderStatus.WAITING': self.updateBuild_WAITING,
+            }
+        handler = builder_status_handlers.get(status_text)
+        if handler is None:
+            logger.critical(
+                "Builder on %s returned unknown status %s; failing it.",
+                self._builder.url, status_text)
+        return handler
+
     def updateBuild(self, queueItem):
         """See `IBuildFarmJobBehavior`."""
         logger = logging.getLogger('slave-scanner')
@@ -76,6 +97,7 @@
         d = self._builder.slaveStatus()
 
         def got_failure(failure):
+            transaction.abort()
             failure.trap(xmlrpclib.Fault, socket.error)
             info = failure.value
             info = ("Could not contact the builder %s, caught a (%s)"
@@ -83,27 +105,22 @@
             raise BuildSlaveFailure(info)
 
         def got_status(slave_status):
-            builder_status_handlers = {
-                'BuilderStatus.IDLE': self.updateBuild_IDLE,
-                'BuilderStatus.BUILDING': self.updateBuild_BUILDING,
-                'BuilderStatus.ABORTING': self.updateBuild_ABORTING,
-                'BuilderStatus.ABORTED': self.updateBuild_ABORTED,
-                'BuilderStatus.WAITING': self.updateBuild_WAITING,
-                }
-
             builder_status = slave_status['builder_status']
-            if builder_status not in builder_status_handlers:
-                logger.critical(
-                    "Builder on %s returned unknown status %s, failing it"
-                    % (self._builder.url, builder_status))
-                self._builder.failBuilder(
+            status_handler = self._getBuilderStatusHandler(
+                builder_status, logger)
+            if status_handler is None:
+                error = (
                     "Unknown status code (%s) returned from status() probe."
                     % builder_status)
-                # XXX: This will leave the build and job in a bad state, but
-                # should never be possible, since our builder statuses are
-                # known.
-                queueItem._builder = None
-                queueItem.setDateStarted(None)
+                transaction.commit()
+                with DatabaseTransactionPolicy(read_only=False):
+                    self._builder.failBuilder(error)
+                    # XXX: This will leave the build and job in a bad
+                    # state, but should never be possible since our
+                    # builder statuses are known.
+                    queueItem._builder = None
+                    queueItem.setDateStarted(None)
+                    transaction.commit()
                 return
 
             # Since logtail is a xmlrpclib.Binary container and it is
@@ -113,9 +130,8 @@
             # will simply remove the proxy.
             logtail = removeSecurityProxy(slave_status.get('logtail'))
 
-            method = builder_status_handlers[builder_status]
             return defer.maybeDeferred(
-                method, queueItem, slave_status, logtail, logger)
+                status_handler, queueItem, slave_status, logtail, logger)
 
         d.addErrback(got_failure)
         d.addCallback(got_status)
@@ -127,22 +143,32 @@
         Log this and reset the record.
         """
         logger.warn(
-            "Builder %s forgot about buildqueue %d -- resetting buildqueue "
-            "record" % (queueItem.builder.url, queueItem.id))
-        queueItem.reset()
+            "Builder %s forgot about buildqueue %d -- "
+            "resetting buildqueue record.",
+            queueItem.builder.url, queueItem.id)
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            queueItem.reset()
+            transaction.commit()
 
     def updateBuild_BUILDING(self, queueItem, slave_status, logtail, logger):
         """Build still building, collect the logtail"""
-        if queueItem.job.status != JobStatus.RUNNING:
-            queueItem.job.start()
-        queueItem.logtail = encoding.guess(str(logtail))
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            if queueItem.job.status != JobStatus.RUNNING:
+                queueItem.job.start()
+            queueItem.logtail = encoding.guess(str(logtail))
+            transaction.commit()
 
     def updateBuild_ABORTING(self, queueItem, slave_status, logtail, logger):
         """Build was ABORTED.
 
         Master-side should wait until the slave finish the process correctly.
         """
-        queueItem.logtail = "Waiting for slave process to be terminated"
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            queueItem.logtail = "Waiting for slave process to be terminated"
+            transaction.commit()
 
     def updateBuild_ABORTED(self, queueItem, slave_status, logtail, logger):
         """ABORTING process has successfully terminated.
@@ -150,11 +176,16 @@
         Clean the builder for another jobs.
         """
         d = queueItem.builder.cleanSlave()
+
         def got_cleaned(ignored):
-            queueItem.builder = None
-            if queueItem.job.status != JobStatus.FAILED:
-                queueItem.job.fail()
-            queueItem.specific_job.jobAborted()
+            transaction.commit()
+            with DatabaseTransactionPolicy(read_only=False):
+                queueItem.builder = None
+                if queueItem.job.status != JobStatus.FAILED:
+                    queueItem.job.fail()
+                queueItem.specific_job.jobAborted()
+                transaction.commit()
+
         return d.addCallback(got_cleaned)
 
     def extractBuildStatus(self, slave_status):

=== modified file 'lib/lp/buildmaster/model/buildqueue.py'
--- lib/lp/buildmaster/model/buildqueue.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/model/buildqueue.py	2012-01-04 16:39:15 +0000
@@ -53,7 +53,6 @@
     )
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.job.model.job import Job
-<<<<<<< TREE
 from lp.services.propertycache import (
     cachedproperty,
     get_property_cache,
@@ -63,13 +62,6 @@
     IStoreSelector,
     MAIN_STORE,
     )
-=======
-from lp.services.webapp.interfaces import (
-    DEFAULT_FLAVOR,
-    IStoreSelector,
-    MAIN_STORE,
-    )
->>>>>>> MERGE-SOURCE
 
 
 def normalize_virtualization(virtualized):
@@ -156,7 +148,6 @@
         specific_class = specific_job_classes()[self.job_type]
         return specific_class.getByJob(self.job)
 
-<<<<<<< TREE
     def _clear_specific_job_cache(self):
         del get_property_cache(self).specific_job
 
@@ -181,23 +172,6 @@
                 cache = get_property_cache(queue)
                 cache.specific_job = specific_jobs_dict[queue.job]
 
-=======
-    @staticmethod
-    def preloadSpecificJobData(queues):
-        key = attrgetter('job_type')
-        for job_type, grouped_queues in groupby(queues, key=key):
-            specific_class = specific_job_classes()[job_type]
-            queue_subset = list(grouped_queues)
-            # We need to preload the build farm jobs early to avoid
-            # the call to _set_build_farm_job to look up BuildFarmBuildJobs
-            # one by one.
-            specific_class.preloadBuildFarmJobs(queue_subset)
-            specific_jobs = specific_class.getByJobs(queue_subset)
-            if len(list(specific_jobs)) == 0:
-                continue
-            specific_class.preloadJobsData(specific_jobs)
-
->>>>>>> MERGE-SOURCE
     @property
     def date_started(self):
         """See `IBuildQueue`."""

=== modified file 'lib/lp/buildmaster/model/packagebuild.py'
--- lib/lp/buildmaster/model/packagebuild.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/model/packagebuild.py	2012-01-06 08:24:33 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 __metaclass__ = type
@@ -24,6 +24,7 @@
     Storm,
     Unicode,
     )
+import transaction
 from zope.component import getUtility
 from zope.interface import (
     classProvides,
@@ -47,7 +48,6 @@
     )
 from lp.buildmaster.model.buildqueue import BuildQueue
 from lp.registry.interfaces.pocket import PackagePublishingPocket
-<<<<<<< TREE
 from lp.services.config import config
 from lp.services.database.enumcol import DBEnum
 from lp.services.database.lpstorm import IMasterStore
@@ -60,19 +60,6 @@
     IStoreSelector,
     MAIN_STORE,
     )
-=======
-from lp.services.config import config
-from lp.services.database.enumcol import DBEnum
-from lp.services.database.lpstorm import IMasterStore
-from lp.services.helpers import filenameToContentType
-from lp.services.librarian.browser import ProxiedLibraryFileAlias
-from lp.services.librarian.interfaces import ILibraryFileAliasSet
-from lp.services.webapp.interfaces import (
-    DEFAULT_FLAVOR,
-    IStoreSelector,
-    MAIN_STORE,
-    )
->>>>>>> MERGE-SOURCE
 from lp.soyuz.adapters.archivedependencies import (
     default_component_dependency_name,
     )
@@ -192,19 +179,24 @@
     def storeBuildInfo(build, librarian, slave_status):
         """See `IPackageBuild`."""
         def got_log(lfa_id):
+            dependencies = slave_status.get('dependencies')
+            if dependencies is not None:
+                dependencies = unicode(dependencies)
+
             # log, builder and date_finished are read-only, so we must
             # currently remove the security proxy to set them.
             naked_build = removeSecurityProxy(build)
-            naked_build.log = lfa_id
-            naked_build.builder = build.buildqueue_record.builder
-            # XXX cprov 20060615 bug=120584: Currently buildduration includes
-            # the scanner latency, it should really be asking the slave for
-            # the duration spent building locally.
-            naked_build.date_finished = datetime.datetime.now(pytz.UTC)
-            if slave_status.get('dependencies') is not None:
-                build.dependencies = unicode(slave_status.get('dependencies'))
-            else:
-                build.dependencies = None
+
+            transaction.commit()
+            with DatabaseTransactionPolicy(read_only=False):
+                naked_build.log = lfa_id
+                naked_build.builder = build.buildqueue_record.builder
+                # XXX cprov 20060615 bug=120584: Currently buildduration
+                # includes the scanner latency.  It should really be asking
+                # the slave for the duration spent building locally.
+                naked_build.date_finished = datetime.datetime.now(pytz.UTC)
+                build.dependencies = dependencies
+                transaction.commit()
 
         d = build.getLogFromSlave(build)
         return d.addCallback(got_log)
@@ -306,22 +298,41 @@
 
     def handleStatus(self, status, librarian, slave_status):
         """See `IPackageBuild`."""
+        # Avoid circular imports.
         from lp.buildmaster.manager import BUILDD_MANAGER_LOG_NAME
+
         logger = logging.getLogger(BUILDD_MANAGER_LOG_NAME)
         send_notification = status in self.ALLOWED_STATUS_NOTIFICATIONS
         method = getattr(self, '_handleStatus_' + status, None)
         if method is None:
-            logger.critical("Unknown BuildStatus '%s' for builder '%s'"
-                            % (status, self.buildqueue_record.builder.url))
-            return
+            logger.critical(
+                "Unknown BuildStatus '%s' for builder '%s'",
+                status, self.buildqueue_record.builder.url)
+            return None
+
         d = method(librarian, slave_status, logger, send_notification)
         return d
 
+    def _destroy_buildqueue_record(self, unused_arg):
+        """Destroy this build's `BuildQueue` record."""
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            self.buildqueue_record.destroySelf()
+            transaction.commit()
+
     def _release_builder_and_remove_queue_item(self):
         # Release the builder for another job.
         d = self.buildqueue_record.builder.cleanSlave()
         # Remove BuildQueue record.
-        return d.addCallback(lambda x: self.buildqueue_record.destroySelf())
+        return d.addCallback(self._destroy_buildqueue_record)
+
+    def _notify_if_appropriate(self, appropriate=True, extra_info=None):
+        """If `appropriate`, call `self.notify` in a write transaction."""
+        if appropriate:
+            transaction.commit()
+            with DatabaseTransactionPolicy(read_only=False):
+                self.notify(extra_info=extra_info)
+                transaction.commit()
 
     def _handleStatus_OK(self, librarian, slave_status, logger,
                          send_notification):
@@ -337,16 +348,19 @@
             self.buildqueue_record.specific_job.build.title,
             self.buildqueue_record.builder.name))
 
-        # If this is a binary package build, discard it if its source is
-        # no longer published.
+        # If this is a binary package build for a source that is no
+        # longer published, discard it.
         if self.build_farm_job_type == BuildFarmJobType.PACKAGEBUILD:
             build = self.buildqueue_record.specific_job.build
             if not build.current_source_publication:
-                build.status = BuildStatus.SUPERSEDED
+                transaction.commit()
+                with DatabaseTransactionPolicy(read_only=False):
+                    build.status = BuildStatus.SUPERSEDED
+                    transaction.commit()
                 return self._release_builder_and_remove_queue_item()
 
-        # Explode before collect a binary that is denied in this
-        # distroseries/pocket
+        # Explode rather than collect a binary that is denied in this
+        # distroseries/pocket.
         if not self.archive.allowUpdatesToReleasePocket():
             assert self.distro_series.canUploadToPocket(self.pocket), (
                 "%s (%s) can not be built for pocket %s: illegal status"
@@ -391,18 +405,26 @@
             # files from the slave.
             if successful_copy_from_slave:
                 logger.info(
-                    "Gathered %s %d completely. Moving %s to uploader queue."
-                    % (self.__class__.__name__, self.id, upload_leaf))
+                    "Gathered %s %d completely. "
+                    "Moving %s to uploader queue.",
+                    self.__class__.__name__, self.id, upload_leaf)
                 target_dir = os.path.join(root, "incoming")
-                self.status = BuildStatus.UPLOADING
+                resulting_status = BuildStatus.UPLOADING
             else:
                 logger.warning(
-                    "Copy from slave for build %s was unsuccessful.", self.id)
-                self.status = BuildStatus.FAILEDTOUPLOAD
-                if send_notification:
-                    self.notify(
-                        extra_info='Copy from slave was unsuccessful.')
+                    "Copy from slave for build %s was unsuccessful.",
+                    self.id)
                 target_dir = os.path.join(root, "failed")
+                resulting_status = BuildStatus.FAILEDTOUPLOAD
+
+            transaction.commit()
+            with DatabaseTransactionPolicy(read_only=False):
+                self.status = resulting_status
+                transaction.commit()
+
+            if not successful_copy_from_slave:
+                self._notify_if_appropriate(
+                    send_notification, "Copy from slave was unsuccessful.")
 
             if not os.path.exists(target_dir):
                 os.mkdir(target_dir)
@@ -410,10 +432,6 @@
             # Release the builder for another job.
             d = self._release_builder_and_remove_queue_item()
 
-            # Commit so there are no race conditions with archiveuploader
-            # about self.status.
-            Store.of(self).commit()
-
             # Move the directory used to grab the binaries into
             # the incoming directory so the upload processor never
             # sees half-finished uploads.
@@ -437,14 +455,15 @@
         set the job status as FAILEDTOBUILD, store available info and
         remove Buildqueue entry.
         """
-        self.status = BuildStatus.FAILEDTOBUILD
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            self.status = BuildStatus.FAILEDTOBUILD
+            transaction.commit()
 
         def build_info_stored(ignored):
-            if send_notification:
-                self.notify()
+            self._notify_if_appropriate(send_notification)
             d = self.buildqueue_record.builder.cleanSlave()
-            return d.addCallback(
-                lambda x: self.buildqueue_record.destroySelf())
+            return d.addCallback(self._destroy_buildqueue_record)
 
         d = self.storeBuildInfo(self, librarian, slave_status)
         return d.addCallback(build_info_stored)
@@ -464,11 +483,9 @@
         def build_info_stored(ignored):
             logger.critical("***** %s is MANUALDEPWAIT *****"
                             % self.buildqueue_record.builder.name)
-            if send_notification:
-                self.notify()
+            self._notify_if_appropriate(send_notification)
             d = self.buildqueue_record.builder.cleanSlave()
-            return d.addCallback(
-                lambda x: self.buildqueue_record.destroySelf())
+            return d.addCallback(self._destroy_buildqueue_record)
 
         d = self.storeBuildInfo(self, librarian, slave_status)
         return d.addCallback(build_info_stored)
@@ -486,17 +503,24 @@
             transaction.commit()
 
         def build_info_stored(ignored):
-            logger.critical("***** %s is CHROOTWAIT *****" %
-                            self.buildqueue_record.builder.name)
-            if send_notification:
-                self.notify()
+            logger.critical(
+                "***** %s is CHROOTWAIT *****",
+                self.buildqueue_record.builder.name)
+
+            self._notify_if_appropriate(send_notification)
             d = self.buildqueue_record.builder.cleanSlave()
-            return d.addCallback(
-                lambda x: self.buildqueue_record.destroySelf())
+            return d.addCallback(self._destroy_buildqueue_record)
 
         d = self.storeBuildInfo(self, librarian, slave_status)
         return d.addCallback(build_info_stored)
 
+    def _reset_buildqueue_record(self, ignored_arg=None):
+        """Reset the `BuildQueue` record, in a write transaction."""
+        transaction.commit()
+        with DatabaseTransactionPolicy(read_only=False):
+            self.buildqueue_record.reset()
+            transaction.commit()
+
     def _handleStatus_BUILDERFAIL(self, librarian, slave_status, logger,
                                   send_notification):
         """Handle builder failures.
@@ -510,11 +534,8 @@
         self.buildqueue_record.builder.failBuilder(
             "Builder returned BUILDERFAIL when asked for its status")
 
-        def build_info_stored(ignored):
-            # simply reset job
-            self.buildqueue_record.reset()
         d = self.storeBuildInfo(self, librarian, slave_status)
-        return d.addCallback(build_info_stored)
+        return d.addCallback(self._reset_buildqueue_record)
 
     def _handleStatus_GIVENBACK(self, librarian, slave_status, logger,
                                 send_notification):
@@ -534,7 +555,7 @@
             # the next Paris Summit, infinity has some ideas about how
             # to use this content. For now we just ensure it's stored.
             d = self.buildqueue_record.builder.cleanSlave()
-            self.buildqueue_record.reset()
+            self._reset_buildqueue_record()
             return d
 
         d = self.storeBuildInfo(self, librarian, slave_status)

=== modified file 'lib/lp/buildmaster/tests/test_builder.py'
--- lib/lp/buildmaster/tests/test_builder.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/tests/test_builder.py	2012-01-03 13:44:35 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Test Builder features."""
@@ -15,6 +15,7 @@
     AsynchronousDeferredRunTestForBrokenTwisted,
     SynchronousDeferredRunTest,
     )
+import transaction
 from twisted.internet.defer import (
     CancelledError,
     DeferredList,
@@ -61,14 +62,9 @@
     TrivialBehavior,
     WaitingSlave,
     )
-<<<<<<< TREE
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.services.config import config
 from lp.services.database.sqlbase import flush_database_updates
-=======
-from lp.services.config import config
-from lp.services.database.sqlbase import flush_database_updates
->>>>>>> MERGE-SOURCE
 from lp.services.job.interfaces.job import JobStatus
 from lp.services.log.logger import BufferLogger
 from lp.services.webapp.interfaces import (
@@ -89,14 +85,7 @@
     TestCaseWithFactory,
     )
 from lp.testing.fakemethod import FakeMethod
-<<<<<<< TREE
 from lp.testing.layers import LaunchpadZopelessLayer
-=======
-from lp.testing.layers import (
-    DatabaseFunctionalLayer,
-    LaunchpadZopelessLayer,
-    )
->>>>>>> MERGE-SOURCE
 
 
 class TestBuilderBasics(TestCaseWithFactory):
@@ -181,7 +170,7 @@
         d = lostbuilding_builder.updateStatus(BufferLogger())
         def check_slave_status(failure):
             self.assertIn('abort', slave.call_log)
-            # 'Fault' comes from the LostBuildingBrokenSlave, this is
+            # 'Fault' comes from the LostBuildingBrokenSlave.  This is
             # just testing that the value is passed through.
             self.assertIsInstance(failure.value, xmlrpclib.Fault)
         return d.addBoth(check_slave_status)
@@ -583,7 +572,6 @@
         # And the old_candidate is superseded:
         self.assertEqual(BuildStatus.SUPERSEDED, build.status)
 
-<<<<<<< TREE
     def test_findBuildCandidate_postprocesses_in_read_write_policy(self):
         # _findBuildCandidate invokes BuildFarmJob.postprocessCandidate,
         # which may modify the database.  This happens in a read-write
@@ -602,8 +590,6 @@
         # Passes without a "transaction is read-only" error...
         transaction.commit()
 
-=======
->>>>>>> MERGE-SOURCE
     def test_acquireBuildCandidate_marks_building(self):
         # acquireBuildCandidate() should call _findBuildCandidate and
         # mark the build as building.

=== modified file 'lib/lp/buildmaster/tests/test_manager.py'
--- lib/lp/buildmaster/tests/test_manager.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/tests/test_manager.py	2012-01-03 13:44:35 +0000
@@ -1,8 +1,9 @@
-# Copyright 2009-2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the renovated slave scanner aka BuilddManager."""
 
+from collections import namedtuple
 import os
 import signal
 import time
@@ -33,25 +34,19 @@
     SlaveScanner,
     )
 from lp.buildmaster.model.builder import Builder
-<<<<<<< TREE
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.buildmaster.testing import BuilddManagerTestFixture
-=======
->>>>>>> MERGE-SOURCE
 from lp.buildmaster.tests.harness import BuilddManagerTestSetup
 from lp.buildmaster.tests.mock_slaves import (
     BrokenSlave,
     BuildingSlave,
     make_publisher,
     OkSlave,
+    WaitingSlave,
     )
 from lp.registry.interfaces.distribution import IDistributionSet
-<<<<<<< TREE
 from lp.services.config import config
 from lp.services.database.constants import UTC_NOW
-=======
-from lp.services.config import config
->>>>>>> MERGE-SOURCE
 from lp.services.log.logger import BufferLogger
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
 from lp.testing import (
@@ -62,7 +57,6 @@
     )
 from lp.testing.factory import LaunchpadObjectFactory
 from lp.testing.fakemethod import FakeMethod
-<<<<<<< TREE
 from lp.testing.layers import (
     LaunchpadScriptLayer,
     LaunchpadZopelessLayer,
@@ -71,17 +65,10 @@
 from lp.testing.sampledata import (
     BOB_THE_BUILDER_NAME,
     FROG_THE_BUILDER_NAME,
-=======
-from lp.testing.layers import (
-    LaunchpadScriptLayer,
-    LaunchpadZopelessLayer,
-    ZopelessDatabaseLayer,
->>>>>>> MERGE-SOURCE
     )
-from lp.testing.sampledata import BOB_THE_BUILDER_NAME
-
-
-class TestSlaveScannerScan(TestCase):
+
+
+class TestSlaveScannerScan(TestCaseWithFactory):
     """Tests `SlaveScanner.scan` method.
 
     This method uses the old framework for scanning and dispatching builds.
@@ -103,11 +90,8 @@
         test_publisher.setUpDefaultDistroSeries(hoary)
         test_publisher.addFakeChroots()
 
-<<<<<<< TREE
         self.useFixture(BuilddManagerTestFixture())
 
-=======
->>>>>>> MERGE-SOURCE
     def _resetBuilder(self, builder):
         """Reset the given builder and its job."""
         builder.builderok = True
@@ -115,7 +99,6 @@
         if job is not None:
             job.reset()
 
-<<<<<<< TREE
     def getFreshBuilder(self, slave=None, name=BOB_THE_BUILDER_NAME,
                         failure_count=0):
         """Return a builder.
@@ -133,10 +116,6 @@
         builder.failure_count = failure_count
         return builder
 
-=======
-        transaction.commit()
-
->>>>>>> MERGE-SOURCE
     def assertBuildingJob(self, job, builder, logtail=None):
         """Assert the given job is building on the given builder."""
         from lp.services.job.interfaces.job import JobStatus
@@ -151,14 +130,14 @@
         self.assertEqual(build.status, BuildStatus.BUILDING)
         self.assertEqual(job.logtail, logtail)
 
-    def _getScanner(self, builder_name=None):
+    def _getScanner(self, builder_name=None, clock=None):
         """Instantiate a SlaveScanner object.
 
         Replace its default logging handler by a testing version.
         """
         if builder_name is None:
             builder_name = BOB_THE_BUILDER_NAME
-        scanner = SlaveScanner(builder_name, BufferLogger())
+        scanner = SlaveScanner(builder_name, BufferLogger(), clock=clock)
         scanner.logger.name = 'slave-scanner'
 
         return scanner
@@ -174,21 +153,11 @@
     def testScanDispatchForResetBuilder(self):
         # A job gets dispatched to the sampledata builder after it's reset.
 
-<<<<<<< TREE
         # Obtain a builder.   Initialize failure count to 1 so that
         # _checkDispatch can make sure that a successful dispatch resets
         # the count to 0.
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.getFreshBuilder(failure_count=1)
-=======
-        # Reset sampledata builder.
-        builder = getUtility(IBuilderSet)[BOB_THE_BUILDER_NAME]
-        self._resetBuilder(builder)
-        builder.setSlaveForTesting(OkSlave())
-        # Set this to 1 here so that _checkDispatch can make sure it's
-        # reset to 0 after a successful dispatch.
-        builder.failure_count = 1
->>>>>>> MERGE-SOURCE
 
         # Run 'scan' and check its result.
         self.layer.switchDbUser(config.builddmaster.dbuser)
@@ -204,17 +173,16 @@
         to the asynchonous dispatcher and the builder remained active
         and IDLE.
         """
-        self.assertTrue(slave is None, "Unexpected slave.")
+        self.assertIs(None, slave, "Unexpected slave.")
 
         builder = getUtility(IBuilderSet).get(builder.id)
         self.assertTrue(builder.builderok)
-        self.assertTrue(builder.currentjob is None)
+        self.assertIs(None, builder.currentjob)
 
     def testNoDispatchForMissingChroots(self):
         # When a required chroot is not present the `scan` method
         # should not return any `RecordingSlaves` to be processed
         # and the builder used should remain active and IDLE.
-<<<<<<< TREE
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.getFreshBuilder()
             # Remove hoary/i386 chroot.
@@ -225,20 +193,6 @@
                 hoary.getDistroArchSeries('i386').getPocketChroot())
             removeSecurityProxy(pocket_chroot).chroot = None
 
-=======
-
-        # Reset sampledata builder.
-        builder = getUtility(IBuilderSet)[BOB_THE_BUILDER_NAME]
-        self._resetBuilder(builder)
-
-        # Remove hoary/i386 chroot.
-        login('[e-mail]')
-        ubuntu = getUtility(IDistributionSet).getByName('ubuntu')
-        hoary = ubuntu.getSeries('hoary')
-        pocket_chroot = hoary.getDistroArchSeries('i386').getPocketChroot()
-        removeSecurityProxy(pocket_chroot).chroot = None
-        transaction.commit()
->>>>>>> MERGE-SOURCE
         login(ANONYMOUS)
 
         # Run 'scan' and check its result.
@@ -325,31 +279,18 @@
         return d
 
     def test_scan_with_nothing_to_dispatch(self):
-<<<<<<< TREE
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.factory.makeBuilder()
             builder.setSlaveForTesting(OkSlave())
-=======
-        factory = LaunchpadObjectFactory()
-        builder = factory.makeBuilder()
-        builder.setSlaveForTesting(OkSlave())
->>>>>>> MERGE-SOURCE
         scanner = self._getScanner(builder_name=builder.name)
         d = scanner.scan()
         return d.addCallback(self._checkNoDispatch, builder)
 
     def test_scan_with_manual_builder(self):
         # Reset sampledata builder.
-<<<<<<< TREE
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.getFreshBuilder()
             builder.manual = True
-=======
-        builder = getUtility(IBuilderSet)[BOB_THE_BUILDER_NAME]
-        self._resetBuilder(builder)
-        builder.setSlaveForTesting(OkSlave())
-        builder.manual = True
->>>>>>> MERGE-SOURCE
         scanner = self._getScanner()
         d = scanner.scan()
         d.addCallback(self._checkNoDispatch, builder)
@@ -357,16 +298,9 @@
 
     def test_scan_with_not_ok_builder(self):
         # Reset sampledata builder.
-<<<<<<< TREE
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.getFreshBuilder()
             builder.builderok = False
-=======
-        builder = getUtility(IBuilderSet)[BOB_THE_BUILDER_NAME]
-        self._resetBuilder(builder)
-        builder.setSlaveForTesting(OkSlave())
-        builder.builderok = False
->>>>>>> MERGE-SOURCE
         scanner = self._getScanner()
         d = scanner.scan()
         # Because the builder is not ok, we can't use _checkNoDispatch.
@@ -375,41 +309,29 @@
         return d
 
     def test_scan_of_broken_slave(self):
-<<<<<<< TREE
         with BuilddManagerTestFixture.extraSetUp():
             builder = self.getFreshBuilder(slave=BrokenSlave())
-=======
-        builder = getUtility(IBuilderSet)[BOB_THE_BUILDER_NAME]
-        self._resetBuilder(builder)
-        builder.setSlaveForTesting(BrokenSlave())
-        builder.failure_count = 0
->>>>>>> MERGE-SOURCE
         scanner = self._getScanner(builder_name=builder.name)
         d = scanner.scan()
         return assert_fails_with(d, xmlrpclib.Fault)
 
     def _assertFailureCounting(self, builder_count, job_count,
                                expected_builder_count, expected_job_count):
+        # Avoid circular imports.
+        from lp.buildmaster import manager as manager_module
+
         # If scan() fails with an exception, failure_counts should be
         # incremented.  What we do with the results of the failure
         # counts is tested below separately, this test just makes sure that
         # scan() is setting the counts.
         def failing_scan():
             return defer.fail(Exception("fake exception"))
-<<<<<<< TREE
 
         with BuilddManagerTestFixture.extraSetUp():
             scanner = self._getScanner()
             scanner.scan = failing_scan
             self.patch(manager_module, 'assessFailureCounts', FakeMethod())
             builder = getUtility(IBuilderSet)[scanner.builder_name]
-=======
-        scanner = self._getScanner()
-        scanner.scan = failing_scan
-        from lp.buildmaster import manager as manager_module
-        self.patch(manager_module, 'assessFailureCounts', FakeMethod())
-        builder = getUtility(IBuilderSet)[scanner.builder_name]
->>>>>>> MERGE-SOURCE
 
             builder.failure_count = builder_count
             builder.currentjob.specific_job.build.failure_count = job_count
@@ -558,7 +480,6 @@
         d.addCallback(check_cancelled, builder, buildqueue)
         return d
 
-<<<<<<< TREE
     def makeFakeFailure(self):
         """Produce a fake failure for use with SlaveScanner._scanFailed."""
         FakeFailure = namedtuple('FakeFailure', ['getErrorMessage', 'check'])
@@ -616,8 +537,6 @@
         # The work done by the broken scanner is rolled back.
         self.assertEqual(original_broken_builder_title, broken_builder.title)
 
-=======
->>>>>>> MERGE-SOURCE
 
 class TestCancellationChecking(TestCaseWithFactory):
     """Unit tests for the checkCancellation method."""

=== modified file 'lib/lp/buildmaster/tests/test_packagebuild.py'
--- lib/lp/buildmaster/tests/test_packagebuild.py	2012-01-09 13:42:03 +0000
+++ lib/lp/buildmaster/tests/test_packagebuild.py	2012-01-06 08:27:55 +0000
@@ -1,4 +1,4 @@
-# Copyright 2010 Canonical Ltd.  This software is licensed under the
+# Copyright 2010-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for `IPackageBuild`."""
@@ -27,6 +27,7 @@
     IPackageBuildSet,
     IPackageBuildSource,
     )
+from lp.buildmaster.model.builder import BuilderSlave
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.buildmaster.testing import BuilddManagerTestFixture
@@ -283,10 +284,7 @@
 
 
 class TestHandleStatusMixin:
-    """Tests for `IPackageBuild`s handleStatus method.
-
-    This should be run with a Trial TestCase.
-    """
+    """Tests for `IPackageBuild`s handleStatus method."""
 
     layer = LaunchpadZopelessLayer
     run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=20)
@@ -306,7 +304,7 @@
         self.build.buildqueue_record.setDateStarted(UTC_NOW)
         self.slave = WaitingSlave('BuildStatus.OK')
         self.slave.valid_file_hashes.append('test_file_hash')
-        builder.setSlaveForTesting(self.slave)
+        self.patch(BuilderSlave, 'makeBuilderSlave', FakeMethod(self.slave))
 
         # We overwrite the buildmaster root to use a temp directory.
         tempdir = tempfile.mkdtemp()
@@ -349,7 +347,7 @@
         def got_status(ignored):
             self.assertEqual(BuildStatus.FAILEDTOUPLOAD, self.build.status)
             self.assertResultCount(0, "failed")
-            self.assertIdentical(None, self.build.buildqueue_record)
+            self.assertIs(None, self.build.buildqueue_record)
 
         d = self.build.handleStatus('OK', None, {
             'filemap': {'/tmp/myfile.py': 'test_file_hash'},
@@ -392,14 +390,10 @@
 
         def got_status(ignored):
             if expected_notification:
-                self.failIf(
-                    len(pop_notifications()) == 0,
-                    "No notifications received")
+                self.assertNotEqual(
+                    0, len(pop_notifications()), "No notifications received.")
             else:
-                self.failIf(
-                    len(pop_notifications()) > 0,
-                    "Notifications received")
-
+                self.assertContentEqual([], pop_notifications())
         d = self.build.handleStatus(status, None, {})
         return d.addCallback(got_status)
 

=== modified file 'lib/lp/code/browser/sourcepackagerecipebuild.py'
--- lib/lp/code/browser/sourcepackagerecipebuild.py	2012-01-09 13:42:03 +0000
+++ lib/lp/code/browser/sourcepackagerecipebuild.py	2012-01-04 20:16:10 +0000
@@ -25,7 +25,6 @@
     ISourcePackageRecipeBuild,
     )
 from lp.services.job.interfaces.job import JobStatus
-<<<<<<< TREE
 from lp.services.librarian.browser import FileNavigationMixin
 from lp.services.propertycache import (
     cachedproperty,
@@ -38,18 +37,6 @@
     Link,
     Navigation,
     )
-=======
-from lp.services.librarian.browser import FileNavigationMixin
-from lp.services.propertycache import cachedproperty
-from lp.services.webapp import (
-    canonical_url,
-    ContextMenu,
-    enabled_with_permission,
-    LaunchpadView,
-    Link,
-    Navigation,
-    )
->>>>>>> MERGE-SOURCE
 
 
 UNEDITABLE_BUILD_STATES = (

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2012-01-09 13:42:03 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2012-01-06 08:24:33 +0000
@@ -38,7 +38,6 @@
 from lp.registry.interfaces.person import TeamSubscriptionPolicy
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
-<<<<<<< TREE
 from lp.services.database.constants import UTC_NOW
 from lp.services.propertycache import (
     clear_property_cache,
@@ -46,13 +45,6 @@
 from lp.services.webapp import canonical_url
 from lp.services.webapp.interfaces import ILaunchpadRoot
 from lp.services.webapp.servers import LaunchpadTestRequest
-=======
-from lp.services.database.constants import UTC_NOW
-from lp.services.propertycache import clear_property_cache
-from lp.services.webapp import canonical_url
-from lp.services.webapp.interfaces import ILaunchpadRoot
-from lp.services.webapp.servers import LaunchpadTestRequest
->>>>>>> MERGE-SOURCE
 from lp.soyuz.model.processor import ProcessorFamily
 from lp.testing import (
     ANONYMOUS,

=== modified file 'lib/lp/code/model/sourcepackagerecipebuild.py'
--- lib/lp/code/model/sourcepackagerecipebuild.py	2012-01-09 13:42:03 +0000
+++ lib/lp/code/model/sourcepackagerecipebuild.py	2012-01-04 20:12:28 +0000
@@ -287,7 +287,6 @@
             PackageBuild.build_farm_job_id == build_farm_job.id).one()
 
     @classmethod
-<<<<<<< TREE
     def preloadBuildsData(cls, builds):
         # Circular imports.
         from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
@@ -306,20 +305,6 @@
         SourcePackageRecipe.preLoadDataForSourcePackageRecipes(sprs)
 
     @classmethod
-=======
-    def preloadBuildsData(cls, builds):
-        # Circular imports.
-        from lp.code.model.sourcepackagerecipe import SourcePackageRecipe
-        package_builds = load_related(
-            PackageBuild, builds, ['package_build_id'])
-        archives = load_related(Archive, package_builds, ['archive_id'])
-        load_related(Person, archives, ['ownerID'])
-        sprs = load_related(
-            SourcePackageRecipe, builds, ['recipe_id'])
-        SourcePackageRecipe.preLoadDataForSourcePackageRecipes(sprs)
-
-    @classmethod
->>>>>>> MERGE-SOURCE
     def getByBuildFarmJobs(cls, build_farm_jobs):
         """See `ISpecificBuildFarmJobSource`."""
         if len(build_farm_jobs) == 0:

=== modified file 'lib/lp/code/model/tests/test_sourcepackagerecipebuild.py'
--- lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2012-01-09 13:42:03 +0000
+++ lib/lp/code/model/tests/test_sourcepackagerecipebuild.py	2012-01-03 12:11:57 +0000
@@ -13,14 +13,15 @@
 
 from pytz import utc
 from storm.locals import Store
+from testtools.deferredruntest import AsynchronousDeferredRunTest
 import transaction
-from twisted.trial.unittest import TestCase as TrialTestCase
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
 from lp.app.errors import NotFoundError
 from lp.buildmaster.enums import BuildStatus
 from lp.buildmaster.interfaces.buildqueue import IBuildQueue
+from lp.buildmaster.model.builder import BuilderSlave
 from lp.buildmaster.model.buildfarmjob import BuildFarmJob
 from lp.buildmaster.model.packagebuild import PackageBuild
 from lp.buildmaster.tests.mock_slaves import WaitingSlave
@@ -588,14 +589,11 @@
         self.assertEquals(0, len(notifications))
 
 
-class TestBuildNotifications(TrialTestCase):
+class TestBuildNotifications(TestCaseWithFactory):
 
     layer = LaunchpadZopelessLayer
 
-    def setUp(self):
-        super(TestBuildNotifications, self).setUp()
-        from lp.testing.factory import LaunchpadObjectFactory
-        self.factory = LaunchpadObjectFactory()
+    run_tests_with = AsynchronousDeferredRunTest.make_factory(timeout=20)
 
     def prepare_build(self, fake_successful_upload=False):
         queue_record = self.factory.makeSourcePackageRecipeBuildJob()
@@ -608,7 +606,7 @@
                 result=True)
         queue_record.builder = self.factory.makeBuilder()
         slave = WaitingSlave('BuildStatus.OK')
-        queue_record.builder.setSlaveForTesting(slave)
+        self.patch(BuilderSlave, 'makeBuilderSlave', FakeMethod(slave))
         return build
 
     def assertDeferredNotifyCount(self, status, build, expected_count):
@@ -666,5 +664,5 @@
 
 
 class TestHandleStatusForSPRBuild(
-    MakeSPRecipeBuildMixin, TestHandleStatusMixin, TrialTestCase):
+    MakeSPRecipeBuildMixin, TestHandleStatusMixin, TestCaseWithFactory):
     """IPackageBuild.handleStatus works with SPRecipe builds."""

=== modified file 'lib/lp/code/scripts/tests/test_revisionkarma.py'
--- lib/lp/code/scripts/tests/test_revisionkarma.py	2012-01-09 13:42:03 +0000
+++ lib/lp/code/scripts/tests/test_revisionkarma.py	2012-01-05 00:15:32 +0000
@@ -1,8 +1,4 @@
-<<<<<<< TREE
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-=======
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
->>>>>>> MERGE-SOURCE
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for the cron script that updates revision karma."""

=== modified file 'lib/lp/hardwaredb/doc/hwdb.txt'
--- lib/lp/hardwaredb/doc/hwdb.txt	2012-01-09 13:42:03 +0000
+++ lib/lp/hardwaredb/doc/hwdb.txt	2012-01-09 13:42:13 +0000
@@ -109,7 +109,7 @@
 Limitations:
   * "No name" products like mainboards from companies like ASRock
      or Asus that are directly sold to end users have fingerprints like
-     "American Megatrends Inc. Uknown 1.0".
+     "American Megatrends Inc. Unknown 1.0".
   * A manufacturer may erroneously assign identical DMI values for product
     and vendor to different systems.
   * submissions for "counterfeit systems".
@@ -743,4 +743,3 @@
     >>> set(submission.owner.name for submission
     ...     in owner.hardware_submissions)
     set([u'name12'])
-

=== modified file 'lib/lp/registry/browser/__init__.py'
--- lib/lp/registry/browser/__init__.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/__init__.py	2012-01-05 20:11:40 +0000
@@ -31,7 +31,6 @@
     )
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.series import SeriesStatus
-<<<<<<< TREE
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadEditFormView,
@@ -40,16 +39,6 @@
     canonical_url,
     LaunchpadView,
     )
-=======
-from lp.services.webapp.launchpadform import (
-    action,
-    LaunchpadEditFormView,
-    )
-from lp.services.webapp.publisher import (
-    canonical_url,
-    LaunchpadView,
-    )
->>>>>>> MERGE-SOURCE
 
 
 class StatusCount:

=== modified file 'lib/lp/registry/browser/branding.py'
--- lib/lp/registry/browser/branding.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/branding.py	2012-01-05 20:11:40 +0000
@@ -9,21 +9,13 @@
     'BrandingChangeView',
     ]
 
-<<<<<<< TREE
 from lp.app.widgets.image import ImageChangeWidget
 from lp.app.browser.launchpadform import (
-=======
-from lp.app.widgets.image import ImageChangeWidget
-from lp.services.webapp import (
->>>>>>> MERGE-SOURCE
     action,
     custom_widget,
     LaunchpadEditFormView,
     )
-<<<<<<< TREE
 from lp.services.webapp import canonical_url
-=======
->>>>>>> MERGE-SOURCE
 
 
 class BrandingChangeView(LaunchpadEditFormView):

=== modified file 'lib/lp/registry/browser/configure.zcml'
--- lib/lp/registry/browser/configure.zcml	2011-12-24 17:49:30 +0000
+++ lib/lp/registry/browser/configure.zcml	2012-01-09 13:42:13 +0000
@@ -1279,14 +1279,14 @@
             MilestoneNavigation"/>
     <adapter
         provides="lp.services.webapp.interfaces.IBreadcrumb"
-        for="lp.registry.interfaces.milestone.IMilestone"
+        for="lp.registry.interfaces.milestone.IMilestoneData"
         factory="lp.registry.browser.milestone.MilestoneBreadcrumb"
         permission="zope.Public"/>
     <browser:defaultView
-        for="lp.registry.interfaces.milestone.IMilestone"
+        for="lp.registry.interfaces.milestone.IMilestoneData"
         name="+index"/>
     <browser:url
-        for="lp.registry.interfaces.milestone.IMilestone"
+        for="lp.registry.interfaces.milestone.IMilestoneData"
         path_expression="string:+milestone/${name}"
         rootsite="mainsite"
         attribute_to_parent="target"/>
@@ -1297,7 +1297,7 @@
         template="../templates/milestone-macros.pt"
         class="lp.app.browser.launchpad.Macro"/>
     <browser:pages
-        for="lp.registry.interfaces.milestone.IMilestone"
+        for="lp.registry.interfaces.milestone.IMilestoneData"
         class="lp.registry.browser.milestone.MilestoneView"
         permission="zope.Public">
         <browser:page

=== modified file 'lib/lp/registry/browser/distributionsourcepackage.py'
--- lib/lp/registry/browser/distributionsourcepackage.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/distributionsourcepackage.py	2012-01-05 20:11:40 +0000
@@ -39,13 +39,10 @@
     QuestionTargetTraversalMixin,
     )
 from lp.answers.enums import QuestionStatus
-<<<<<<< TREE
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadEditFormView,
     )
-=======
->>>>>>> MERGE-SOURCE
 from lp.app.browser.stringformatter import (
     extract_bug_numbers,
     extract_email_addresses,
@@ -70,7 +67,6 @@
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.helpers import shortlist
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
 from lp.services.webapp import (
     canonical_url,
     Navigation,
@@ -87,26 +83,6 @@
     )
 from lp.services.webapp.publisher import LaunchpadView
 from lp.services.webapp.sorting import sorted_dotted_numbers
-=======
-from lp.services.webapp import (
-    action,
-    canonical_url,
-    LaunchpadEditFormView,
-    LaunchpadView,
-    Navigation,
-    redirection,
-    StandardLaunchpadFacets,
-    )
-from lp.services.webapp.breadcrumb import Breadcrumb
-from lp.services.webapp.interfaces import IBreadcrumb
-from lp.services.webapp.menu import (
-    ApplicationMenu,
-    enabled_with_permission,
-    Link,
-    NavigationMenu,
-    )
-from lp.services.webapp.sorting import sorted_dotted_numbers
->>>>>>> MERGE-SOURCE
 from lp.soyuz.browser.sourcepackagerelease import linkify_changelog
 from lp.soyuz.interfaces.archive import IArchiveSet
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (

=== modified file 'lib/lp/registry/browser/distroseries.py'
--- lib/lp/registry/browser/distroseries.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/distroseries.py	2012-01-06 11:08:30 +0000
@@ -39,15 +39,10 @@
     SimpleVocabulary,
     )
 
-<<<<<<< TREE
 from lp import _
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
-=======
-from lp import _
-from lp.app.browser.launchpadform import (
->>>>>>> MERGE-SOURCE
     LaunchpadEditFormView,
     LaunchpadFormView,
     )
@@ -87,55 +82,28 @@
 from lp.services.database.constants import UTC_NOW
 from lp.services.features import getFeatureFlag
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
-from lp.services.webapp import (
-    GetitemNavigation,
-    StandardLaunchpadFacets,
-    )
-from lp.services.webapp.authorization import check_permission
-from lp.services.webapp.batching import BatchNavigator
-from lp.services.webapp.breadcrumb import Breadcrumb
-from lp.services.webapp.menu import (
-    ApplicationMenu,
-    enabled_with_permission,
-    Link,
-    NavigationMenu,
-    structured,
-    )
-from lp.services.webapp.publisher import (
-    canonical_url,
-    LaunchpadView,
-    stepthrough,
-    stepto,
-    )
-from lp.services.webapp.url import urlappend
-from lp.services.worlddata.helpers import browser_languages
-=======
-from lp.services.webapp import (
-    action,
-    custom_widget,
-    GetitemNavigation,
-    StandardLaunchpadFacets,
-    )
-from lp.services.webapp.authorization import check_permission
-from lp.services.webapp.batching import BatchNavigator
-from lp.services.webapp.breadcrumb import Breadcrumb
-from lp.services.webapp.menu import (
-    ApplicationMenu,
-    enabled_with_permission,
-    Link,
-    NavigationMenu,
-    structured,
-    )
-from lp.services.webapp.publisher import (
-    canonical_url,
-    LaunchpadView,
-    stepthrough,
-    stepto,
-    )
-from lp.services.webapp.url import urlappend
-from lp.services.worlddata.helpers import browser_languages
->>>>>>> MERGE-SOURCE
+from lp.services.webapp import (
+    GetitemNavigation,
+    StandardLaunchpadFacets,
+    )
+from lp.services.webapp.authorization import check_permission
+from lp.services.webapp.batching import BatchNavigator
+from lp.services.webapp.breadcrumb import Breadcrumb
+from lp.services.webapp.menu import (
+    ApplicationMenu,
+    enabled_with_permission,
+    Link,
+    NavigationMenu,
+    structured,
+    )
+from lp.services.webapp.publisher import (
+    canonical_url,
+    LaunchpadView,
+    stepthrough,
+    stepto,
+    )
+from lp.services.webapp.url import urlappend
+from lp.services.worlddata.helpers import browser_languages
 from lp.services.worlddata.interfaces.country import ICountry
 from lp.services.worlddata.interfaces.language import ILanguageSet
 from lp.soyuz.browser.archive import PackageCopyingMixin

=== modified file 'lib/lp/registry/browser/distroseriesdifference.py'
--- lib/lp/registry/browser/distroseriesdifference.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/distroseriesdifference.py	2012-01-05 20:11:40 +0000
@@ -46,7 +46,6 @@
     IConversation,
     )
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
 from lp.services.webapp import (
     LaunchpadView,
     Navigation,
@@ -54,15 +53,6 @@
     )
 from lp.services.webapp.authorization import check_permission
 from lp.app.browser.launchpadform import custom_widget
-=======
-from lp.services.webapp import (
-    LaunchpadView,
-    Navigation,
-    stepthrough,
-    )
-from lp.services.webapp.authorization import check_permission
-from lp.services.webapp.launchpadform import custom_widget
->>>>>>> MERGE-SOURCE
 
 
 class DistroSeriesDifferenceNavigation(Navigation):

=== modified file 'lib/lp/registry/browser/driver.py'
--- lib/lp/registry/browser/driver.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/driver.py	2012-01-05 20:11:40 +0000
@@ -9,23 +9,14 @@
 from zope.interface import providedBy
 from zope.security.proxy import removeSecurityProxy
 
-<<<<<<< TREE
 from lp.app.browser.launchpadform import (
-=======
-from lp.registry.interfaces.productseries import IProductSeries
-from lp.registry.interfaces.role import IHasAppointedDriver
-from lp.services.webapp import (
->>>>>>> MERGE-SOURCE
     action,
     LaunchpadEditFormView,
     )
-<<<<<<< TREE
 
 from lp.registry.interfaces.productseries import IProductSeries
 from lp.registry.interfaces.role import IHasAppointedDriver
 from lp.services.webapp.publisher import canonical_url
-=======
->>>>>>> MERGE-SOURCE
 
 
 class AppointDriverView(LaunchpadEditFormView):

=== modified file 'lib/lp/registry/browser/karma.py'
--- lib/lp/registry/browser/karma.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/karma.py	2012-01-05 20:11:40 +0000
@@ -13,15 +13,11 @@
 
 from zope.component import getUtility
 
-<<<<<<< TREE
 from lp import _
 from lp.app.browser.launchpadform import (
     action,
     LaunchpadEditFormView,
     )
-=======
-from lp import _
->>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.distribution import IDistribution
 from lp.registry.interfaces.karma import (
     IKarmaAction,
@@ -30,21 +26,11 @@
 from lp.registry.interfaces.product import IProduct
 from lp.registry.interfaces.projectgroup import IProjectGroup
 from lp.services.propertycache import cachedproperty
-<<<<<<< TREE
 from lp.services.webapp import (
     canonical_url,
     Navigation,
     )
 from lp.services.webapp.publisher import LaunchpadView
-=======
-from lp.services.webapp import (
-    action,
-    canonical_url,
-    LaunchpadEditFormView,
-    LaunchpadView,
-    Navigation,
-    )
->>>>>>> MERGE-SOURCE
 
 
 TOP_CONTRIBUTORS_LIMIT = 20

=== modified file 'lib/lp/registry/browser/milestone.py'
--- lib/lp/registry/browser/milestone.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/browser/milestone.py	2012-01-09 13:42:13 +0000
@@ -52,6 +52,7 @@
 from lp.registry.browser.product import ProductDownloadFileMixin
 from lp.registry.interfaces.distroseries import IDistroSeries
 from lp.registry.interfaces.milestone import (
+    IAbstractMilestone,
     IMilestone,
     IMilestoneSet,
     IProjectGroupMilestone,
@@ -84,15 +85,15 @@
 class MilestoneNavigation(Navigation,
     StructuralSubscriptionTargetTraversalMixin):
     """The navigation to traverse to a milestone."""
-    usedfor = IMilestone
+    usedfor = IAbstractMilestone
 
 
 class MilestoneBreadcrumb(Breadcrumb):
-    """The Breadcrumb for an `IMilestone`."""
+    """The Breadcrumb for an `IAbstractMilestone`."""
 
     @property
     def text(self):
-        milestone = IMilestone(self.context)
+        milestone = IAbstractMilestone(self.context)
         if milestone.code_name:
             return '%s "%s"' % (milestone.name, milestone.code_name)
         else:
@@ -139,7 +140,7 @@
 
 class MilestoneContextMenu(ContextMenu, MilestoneLinkMixin):
     """The menu for this milestone."""
-    usedfor = IMilestone
+    usedfor = IAbstractMilestone
 
     @cachedproperty
     def links(self):
@@ -151,7 +152,7 @@
 
 class MilestoneOverviewNavigationMenu(NavigationMenu, MilestoneLinkMixin):
     """Overview navigation menu for `IMilestone` objects."""
-    usedfor = IMilestone
+    usedfor = IAbstractMilestone
     facet = 'overview'
 
     @cachedproperty
@@ -165,7 +166,7 @@
     """Overview  menus for `IMilestone` objects."""
     # This menu must not contain 'subscribe' because the link state is too
     # costly to calculate when this menu is used with a list of milestones.
-    usedfor = IMilestone
+    usedfor = IAbstractMilestone
     facet = 'overview'
     links = ('edit', 'create_release')
 
@@ -199,7 +200,7 @@
         :param request: `ILaunchpadRequest`.
         """
         super(MilestoneView, self).__init__(context, request)
-        if IMilestone.providedBy(context):
+        if IAbstractMilestone.providedBy(context):
             self.milestone = context
             self.release = context.product_release
         else:
@@ -261,9 +262,7 @@
         """The list of non-conjoined bugtasks targeted to this milestone."""
         # Put the results in a list so that iterating over it multiple
         # times in this method does not make multiple queries.
-        non_conjoined_slaves = list(
-            getUtility(IBugTaskSet).getPrecachedNonConjoinedBugTasks(
-                self.user, self.context))
+        non_conjoined_slaves = self.context.bugtasks(self.user)
         # Checking bug permissions is expensive. We know from the query that
         # the user has at least launchpad.View on the bugtasks and their bugs.
         # NB: this is in principle unneeded due to injection of permission in

=== modified file 'lib/lp/registry/browser/nameblacklist.py'
--- lib/lp/registry/browser/nameblacklist.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/nameblacklist.py	2012-01-05 20:11:40 +0000
@@ -19,7 +19,6 @@
     )
 from zope.interface import implements
 
-<<<<<<< TREE
 from lp.app.browser.launchpadform import (
     action,
     custom_widget,
@@ -33,21 +32,6 @@
 from lp.services.webapp.breadcrumb import Breadcrumb
 from lp.services.webapp.interfaces import IBreadcrumb
 from lp.services.webapp.menu import (
-=======
-from lp.app.browser.launchpadform import (
-    custom_widget,
-    LaunchpadFormView,
-    )
-from lp.registry.browser import RegistryEditFormView
-from lp.registry.interfaces.nameblacklist import (
-    INameBlacklist,
-    INameBlacklistSet,
-    )
-from lp.services.webapp import action
-from lp.services.webapp.breadcrumb import Breadcrumb
-from lp.services.webapp.interfaces import IBreadcrumb
-from lp.services.webapp.menu import (
->>>>>>> MERGE-SOURCE
     ApplicationMenu,
     enabled_with_permission,
     Link,

=== modified file 'lib/lp/registry/browser/teammembership.py'
--- lib/lp/registry/browser/teammembership.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/browser/teammembership.py	2012-01-03 22:28:10 +0000
@@ -18,28 +18,15 @@
 from zope.formlib import form
 from zope.schema import Date
 
-<<<<<<< TREE
-from lp import _
-from lp.app.errors import UnexpectedFormData
-from lp.app.widgets.date import DateWidget
-from lp.registry.interfaces.teammembership import TeamMembershipStatus
-from lp.services.webapp import (
-    canonical_url,
-    LaunchpadView,
-    )
-from lp.services.webapp.breadcrumb import Breadcrumb
-=======
-from lp import _
-from lp.app.errors import UnexpectedFormData
-from lp.app.interfaces.launchpad import ILaunchpadCelebrities
-from lp.app.widgets.date import DateWidget
-from lp.registry.interfaces.teammembership import TeamMembershipStatus
-from lp.services.webapp import (
-    canonical_url,
-    LaunchpadView,
-    )
-from lp.services.webapp.breadcrumb import Breadcrumb
->>>>>>> MERGE-SOURCE
+from lp import _
+from lp.app.errors import UnexpectedFormData
+from lp.app.widgets.date import DateWidget
+from lp.registry.interfaces.teammembership import TeamMembershipStatus
+from lp.services.webapp import (
+    canonical_url,
+    LaunchpadView,
+    )
+from lp.services.webapp.breadcrumb import Breadcrumb
 
 
 class TeamMembershipBreadcrumb(Breadcrumb):

=== modified file 'lib/lp/registry/configure.zcml'
--- lib/lp/registry/configure.zcml	2011-12-30 08:03:42 +0000
+++ lib/lp/registry/configure.zcml	2012-01-09 13:42:13 +0000
@@ -404,8 +404,8 @@
                 setAliases"/>
 
         <!-- IProjectGroupModerate -->
-	<allow
-	    interface="lp.registry.interfaces.projectgroup.IProjectGroupModerate"/>
+        <allow
+            interface="lp.registry.interfaces.projectgroup.IProjectGroupModerate"/>
         <require
             permission="launchpad.Moderate"
             set_schema="lp.registry.interfaces.projectgroup.IProjectGroupModerate"/>
@@ -1006,6 +1006,7 @@
                 series_target
                 displayname
                 title
+                bugtasks
                 specifications
                 product_release"/>
         <require
@@ -1013,7 +1014,15 @@
             attributes="
                 createProductRelease
                 closeBugsAndBlueprints
-                destroySelf"/>
+                destroySelf
+                setTags
+                "/>
+        <require
+            permission="zope.Public"
+            attributes="
+                getTags
+                getTagsData
+                "/>
         <allow interface="lp.bugs.interfaces.bugsummary.IBugSummaryDimension"/>
         <allow
             interface="lp.bugs.interfaces.bugtarget.IHasBugs"/>
@@ -1245,7 +1254,7 @@
         <!-- https://lists.ubuntu.com/mailman/private/launchpad/2007-April/015189.html
                         for further discussion - stub 20070411 -->
 
-	<!-- Per bug 588773, changing to launchpad.Moderate to allow Registry Experts (~registry) -->
+        <!-- Per bug 588773, changing to launchpad.Moderate to allow Registry Experts (~registry) -->
         <require
             permission="launchpad.Moderate"
             set_attributes="name autoupdate registrant"/>

=== modified file 'lib/lp/registry/doc/mailinglist-subscriptions.txt'
--- lib/lp/registry/doc/mailinglist-subscriptions.txt	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/doc/mailinglist-subscriptions.txt	2012-01-04 23:49:46 +0000
@@ -1331,17 +1331,9 @@
 
 Now Umma's account is suspended by a Launchpad administrator.
 
-<<<<<<< TREE
     >>> from lp.services.identity.interfaces.account import (
     ...     AccountStatus)
     >>> umma.account.status = AccountStatus.SUSPENDED
-=======
-    >>> from lp.services.identity.interfaces.account import (
-    ...     AccountStatus, IAccountSet)
-    >>> umma_account = getUtility(IAccountSet).getByEmail(
-    ...     '[e-mail]')
-    >>> umma_account.status = AccountStatus.SUSPENDED
->>>>>>> MERGE-SOURCE
     >>> transaction.commit()
 
 Umma is no longer subscribed to the mailing list...

=== modified file 'lib/lp/registry/interfaces/milestone.py'
--- lib/lp/registry/interfaces/milestone.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/interfaces/milestone.py	2012-01-09 13:42:13 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0211,E0213
@@ -8,9 +8,11 @@
 __metaclass__ = type
 
 __all__ = [
+    'IAbstractMilestone',
     'ICanGetMilestonesDirectly',
     'IHasMilestones',
     'IMilestone',
+    'IMilestoneData',
     'IMilestoneSet',
     'IProjectGroupMilestone',
     ]
@@ -97,20 +99,52 @@
         return milestone
 
 
-class IMilestone(IHasBugs, IStructuralSubscriptionTarget,
-                 IHasOfficialBugTags):
-    """A milestone, or a targeting point for bugs and other
-    release-management items that need coordination.
+class IMilestoneData(IHasBugs, IStructuralSubscriptionTarget,
+                     IHasOfficialBugTags):
+    """Interface containing the data for milestones.
+
+    To be registered for views but not instantiated.
     """
-    export_as_webservice_entry()
-
     id = Int(title=_("Id"))
+
     name = exported(
         MilestoneNameField(
             title=_("Name"),
             description=_(
                 "Only letters, numbers, and simple punctuation are allowed."),
             constraint=name_validator))
+    target = exported(
+        Reference(
+            schema=Interface,  # IHasMilestones
+            title=_(
+                "The product, distribution, or project group for this "
+                "milestone."),
+            required=False))
+    specifications = Attribute(
+        "A list of specifications targeted to this object.")
+    dateexpected = exported(
+        FormattableDate(title=_("Date Targeted"), required=False,
+             description=_("Example: 2005-11-24")),
+        exported_as='date_targeted')
+    active = exported(
+        Bool(
+            title=_("Active"),
+            description=_("Whether or not this object should be shown "
+                          "in web forms for targeting.")),
+        exported_as='is_active')
+    displayname = Attribute("A displayname constructed from the name.")
+    title = exported(
+        TextLine(title=_("A context title for pages."),
+                 readonly=True))
+
+    def bugtasks(user):
+        """Get a list of non-conjoined bugtasks visible to this user."""
+
+
+class IAbstractMilestone(IMilestoneData):
+    """An intermediate interface for milestone, or a targeting point for bugs
+    and other release-management items that need coordination.
+    """
     code_name = exported(
         NoneableTextLine(
             title=u'Code name', required=False,
@@ -126,47 +160,24 @@
         title=_("Product Series"),
         description=_("The product series for which this is a milestone."),
         vocabulary="FilteredProductSeries",
-        required=False) # for now
+        required=False)  # for now
     distroseries = Choice(
         title=_("Distro Series"),
         description=_(
             "The distribution series for which this is a milestone."),
         vocabulary="FilteredDistroSeries",
-        required=False) # for now
-    dateexpected = exported(
-        FormattableDate(title=_("Date Targeted"), required=False,
-             description=_("Example: 2005-11-24")),
-        exported_as='date_targeted')
-    active = exported(
-        Bool(
-            title=_("Active"),
-            description=_("Whether or not this milestone should be shown "
-                          "in web forms for bug targeting.")),
-        exported_as='is_active')
+        required=False)  # for now
     summary = exported(
         NoneableDescription(
             title=_("Summary"),
             required=False,
             description=_(
                 "A summary of the features and status of this milestone.")))
-    target = exported(
-        Reference(
-            schema=Interface, # IHasMilestones
-            title=_("The product or distribution of this milestone."),
-            required=False))
     series_target = exported(
         Reference(
-            schema=Interface, # IHasMilestones
+            schema=Interface,  # IHasMilestones
             title=_("The productseries or distroseries of this milestone."),
             required=False))
-    displayname = Attribute("A displayname for this milestone, constructed "
-        "from the milestone name.")
-    title = exported(
-        TextLine(title=_("A milestone context title for pages."),
-                 readonly=True))
-    specifications = Attribute("A list of the specifications targeted to "
-        "this milestone.")
-
     product_release = exported(
         Reference(
             schema=IProductRelease,
@@ -211,6 +222,38 @@
         release.
         """
 
+
+class IMilestone(IAbstractMilestone):
+    """Actual interface for milestones."""
+
+    export_as_webservice_entry()
+
+    def setTags(tags, user):
+        """Set the milestone tags.
+
+        :param: tags The list of tags to be associated with milestone.
+        :param: user The user who is updating tags for this milestone.
+
+        Note that this is not a property because, while the current user
+        is needed to store tags metadata, it is desirable to avoid
+        using thread locals to get the current request in models.
+        """
+
+    def getTagsData():
+        """Return MilestoneTag instances associated with milestone.
+
+        See above the IMilestone.setTags docstring for an explanation of
+        why this is not a property.
+        """
+
+    def getTags():
+        """Return the milestone tags in alphabetical order.
+
+        See above the IMilestone.setTags docstring for an explanation of
+        why this is not a property.
+        """
+
+
 # Avoid circular imports
 IBugTask['milestone'].schema = IMilestone
 patch_plain_parameter_type(
@@ -249,8 +292,9 @@
         """Return all visible milestones."""
 
 
-class IProjectGroupMilestone(IMilestone):
+class IProjectGroupMilestone(IAbstractMilestone):
     """A marker interface for milestones related to a project"""
+    export_as_webservice_entry()
 
 
 class IHasMilestones(Interface):

=== added file 'lib/lp/registry/interfaces/milestonetag.py'
--- lib/lp/registry/interfaces/milestonetag.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/interfaces/milestonetag.py	2012-01-09 13:42:13 +0000
@@ -0,0 +1,20 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""MilestoneTag interfaces."""
+
+__metaclass__ = type
+__all__ = [
+    'IProjectGroupMilestoneTag',
+    ]
+
+
+from lp.registry.interfaces.milestone import IMilestoneData
+
+
+class IProjectGroupMilestoneTag(IMilestoneData):
+    """An IProjectGroupMilestoneTag is a tag aggretating milestones for the
+    ProjectGroup with a given tag or tags.
+
+    This interface is just a marker.
+    """

=== modified file 'lib/lp/registry/model/mailinglist.py'
--- lib/lp/registry/model/mailinglist.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/model/mailinglist.py	2012-01-04 22:30:45 +0000
@@ -1,8 +1,4 @@
-<<<<<<< TREE
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-=======
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
->>>>>>> MERGE-SOURCE
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212

=== modified file 'lib/lp/registry/model/milestone.py'
--- lib/lp/registry/model/milestone.py	2011-12-30 06:14:56 +0000
+++ lib/lp/registry/model/milestone.py	2012-01-09 13:42:13 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 # pylint: disable-msg=E0611,W0212
@@ -8,6 +8,7 @@
 __all__ = [
     'HasMilestonesMixin',
     'Milestone',
+    'MilestoneData',
     'MilestoneSet',
     'ProjectMilestone',
     'milestone_sort_key',
@@ -49,6 +50,7 @@
 from lp.registry.interfaces.milestone import (
     IHasMilestones,
     IMilestone,
+    IMilestoneData,
     IMilestoneSet,
     IProjectGroupMilestone,
     )
@@ -129,11 +131,47 @@
         super(MultipleProductReleases, self).__init__(msg)
 
 
-class Milestone(SQLBase, StructuralSubscriptionTargetMixin, HasBugsBase):
+class MilestoneData:
+    implements(IMilestoneData)
+
+    @property
+    def displayname(self):
+        """See IMilestone."""
+        return "%s %s" % (self.target.displayname, self.name)
+
+    @property
+    def title(self):
+        raise NotImplementedError
+
+    @property
+    def specifications(self):
+        raise NotImplementedError
+
+    def bugtasks(self, user):
+        """The list of non-conjoined bugtasks targeted to this milestone."""
+        # Put the results in a list so that iterating over it multiple
+        # times in this method does not make multiple queries.
+        non_conjoined_slaves = list(
+            getUtility(IBugTaskSet).getPrecachedNonConjoinedBugTasks(
+                user, self))
+        return non_conjoined_slaves
+
+
+class Milestone(SQLBase, MilestoneData, StructuralSubscriptionTargetMixin,
+                HasBugsBase):
     implements(IHasBugs, IMilestone, IBugSummaryDimension)
 
+    active = BoolCol(notNull=True, default=True)
+
+    # XXX: EdwinGrubbs 2009-02-06 bug=326384:
+    # The Milestone.dateexpected should be changed into a date column,
+    # since the class defines the field as a DateCol, so that a list of
+    # milestones can't have some dateexpected attributes that are
+    # datetimes and others that are dates, which can't be compared.
+    dateexpected = DateCol(notNull=False, default=None)
+
     # XXX: Guilherme Salgado 2007-03-27 bug=40978:
-    # Milestones should be associated with productseries/distroseriess
+    # Milestones should be associated with productseries/distroseries
     # so these columns are not needed.
     product = ForeignKey(dbName='product',
         foreignKey='Product', default=None)
@@ -145,23 +183,23 @@
     distroseries = ForeignKey(dbName='distroseries',
         foreignKey='DistroSeries', default=None)
     name = StringCol(notNull=True)
-    # XXX: EdwinGrubbs 2009-02-06 bug=326384:
-    # The Milestone.dateexpected should be changed into a date column,
-    # since the class defines the field as a DateCol, so that a list of
-    # milestones can't have some dateexpected attributes that are
-    # datetimes and others that are dates, which can't be compared.
-    dateexpected = DateCol(notNull=False, default=None)
-    active = BoolCol(notNull=True, default=True)
     summary = StringCol(notNull=False, default=None)
     code_name = StringCol(dbName='codename', notNull=False, default=None)
 
-    # joins
     specifications = SQLMultipleJoin('Specification', joinColumn='milestone',
         orderBy=['-priority', 'definition_status',
                  'implementation_status', 'title'],
         prejoins=['assignee'])
 
     @property
+    def target(self):
+        """See IMilestone."""
+        if self.product:
+            return self.product
+        elif self.distribution:
+            return self.distribution
+
+    @property
     def product_release(self):
         store = Store.of(self)
         result = store.find(ProductRelease,
@@ -173,14 +211,6 @@
             return releases[0]
 
     @property
-    def target(self):
-        """See IMilestone."""
-        if self.product:
-            return self.product
-        elif self.distribution:
-            return self.distribution
-
-    @property
     def series_target(self):
         """See IMilestone."""
         if self.productseries:
@@ -189,11 +219,6 @@
             return self.distroseries
 
     @property
-    def displayname(self):
-        """See IMilestone."""
-        return "%s %s" % (self.target.displayname, self.name)
-
-    @property
     def title(self):
         """See IMilestone."""
         if not self.code_name:
@@ -255,6 +280,44 @@
         from lp.bugs.model.bugsummary import BugSummary
         return BugSummary.milestone_id == self.id
 
+    def setTags(self, tags, user):
+        """See IMilestone."""
+        # Circular reference prevention.
+        from lp.registry.model.milestonetag import MilestoneTag
+        store = Store.of(self)
+        if tags:
+            current_tags = set(self.getTags())
+            new_tags = set(tags)
+            if new_tags == current_tags:
+                return
+            # Removing deleted tags.
+            to_remove = current_tags.difference(new_tags)
+            if to_remove:
+                store.find(
+                    MilestoneTag, MilestoneTag.tag.is_in(to_remove)).remove()
+            # Adding new tags.
+            for tag in new_tags.difference(current_tags):
+                store.add(MilestoneTag(self, tag, user))
+        else:
+            store.find(
+                MilestoneTag, MilestoneTag.milestone_id == self.id).remove()
+        store.commit()
+
+    def getTagsData(self):
+        """See IMilestone."""
+        # Prevent circular references.
+        from lp.registry.model.milestonetag import MilestoneTag
+        store = Store.of(self)
+        return store.find(
+            MilestoneTag, MilestoneTag.milestone_id == self.id
+            ).order_by(MilestoneTag.tag)
+
+    def getTags(self):
+        """See IMilestone."""
+        # Prevent circular references.
+        from lp.registry.model.milestonetag import MilestoneTag
+        return self.getTagsData().values(MilestoneTag.tag)
+
 
 class MilestoneSet:
     implements(IMilestoneSet)
@@ -300,7 +363,7 @@
         return Milestone.selectBy(active=True, orderBy='id')
 
 
-class ProjectMilestone(HasBugsBase):
+class ProjectMilestone(MilestoneData, HasBugsBase):
     """A virtual milestone implementation for project.
 
     The current database schema has no formal concept of milestones related to
@@ -315,12 +378,13 @@
     implements(IProjectGroupMilestone)
 
     def __init__(self, target, name, dateexpected, active):
-        self.name = name
         self.code_name = None
         # The id is necessary for generating a unique memcache key
         # in a page template loop. The ProjectMilestone.id is passed
         # in as the third argument to the "cache" TALes.
         self.id = 'ProjectGroup:%s/Milestone:%s' % (target.name, name)
+        self.name = name
+        self.target = target
         self.code_name = None
         self.product = None
         self.distribution = None
@@ -329,7 +393,6 @@
         self.product_release = None
         self.dateexpected = dateexpected
         self.active = active
-        self.target = target
         self.series_target = None
         self.summary = None
 

=== added file 'lib/lp/registry/model/milestonetag.py'
--- lib/lp/registry/model/milestonetag.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/model/milestonetag.py	2012-01-09 13:42:13 +0000
@@ -0,0 +1,90 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Milestonetag model class."""
+
+__metaclass__ = type
+__all__ = [
+    'MilestoneTag',
+    'ProjectGroupMilestoneTag',
+    ]
+
+
+from zope.interface import implements
+from zope.component import getUtility
+
+from lp.services.webapp.interfaces import (
+    IStoreSelector,
+    MAIN_STORE,
+    DEFAULT_FLAVOR,
+    )
+
+from lp.blueprints.model.specification import Specification
+from lp.registry.interfaces.milestonetag import IProjectGroupMilestoneTag
+from lp.registry.model.milestone import MilestoneData, Milestone
+from lp.registry.model.product import Product
+from storm.locals import (
+    DateTime,
+    Int,
+    Unicode,
+    Reference,
+    )
+
+
+class MilestoneTag(object):
+    """A tag belonging to a milestone."""
+
+    __storm_table__ = 'milestonetag'
+
+    id = Int(primary=True)
+    milestone_id = Int(name='milestone', allow_none=False)
+    milestone = Reference(milestone_id, 'milestone.id')
+    tag = Unicode(allow_none=False)
+    created_by_id = Int(name='created_by', allow_none=False)
+    created_by = Reference(created_by_id, 'person.id')
+    date_created = DateTime(allow_none=False)
+
+    def __init__(self, milestone, tag, created_by, date_created=None):
+        self.milestone_id = milestone.id
+        self.tag = tag
+        self.created_by_id = created_by.id
+        if date_created is not None:
+            self.date_created = date_created
+
+
+class ProjectGroupMilestoneTag(MilestoneData):
+
+    implements(IProjectGroupMilestoneTag)
+
+    def __init__(self, target, tags):
+        self.target = target
+        # Tags is a sequence of Unicode strings.
+        self.tags = tags
+
+    @property
+    def name(self):
+        return u", ".join(self.tags)
+
+    @property
+    def title(self):
+        """See IMilestoneData."""
+        return self.displayname
+
+    @property
+    def specifications(self):
+        """See IMilestoneData."""
+        store = getUtility(IStoreSelector).get(MAIN_STORE, DEFAULT_FLAVOR)
+        results = []
+        for tag in self.tags:
+            result = store.find(
+                Specification,
+                Specification.milestone == Milestone.id,
+                Milestone.product == Product.id,
+                Product.project == self.target,
+                MilestoneTag.milestone_id == Milestone.id,
+                MilestoneTag.tag == tag)
+            results.append(result)
+        result = results.pop()
+        for i in results:
+            result = result.intersection(i)
+        return result

=== modified file 'lib/lp/registry/model/projectgroup.py'
--- lib/lp/registry/model/projectgroup.py	2011-12-30 06:14:56 +0000
+++ lib/lp/registry/model/projectgroup.py	2012-01-09 13:42:13 +0000
@@ -464,19 +464,19 @@
     @property
     def milestones(self):
         """See `IProjectGroup`."""
-        return self._getMilestones(True)
+        return self._getMilestones(only_active=True)
 
     @property
     def product_milestones(self):
         """Hack to avoid the ProjectMilestone in MilestoneVocabulary."""
         # XXX: bug=644977 Robert Collins - this is a workaround for
-        # insconsistency in project group milestone use.
+        # inconsistency in project group milestone use.
         return self._get_milestones()
 
     @property
     def all_milestones(self):
         """See `IProjectGroup`."""
-        return self._getMilestones(False)
+        return self._getMilestones(only_active=False)
 
     def getMilestone(self, name):
         """See `IProjectGroup`."""

=== modified file 'lib/lp/registry/tests/test_milestone.py'
--- lib/lp/registry/tests/test_milestone.py	2012-01-01 02:58:52 +0000
+++ lib/lp/registry/tests/test_milestone.py	2012-01-09 13:42:13 +0000
@@ -1,4 +1,4 @@
-# Copyright 2009 Canonical Ltd.  This software is licensed under the
+# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Milestone related test helper."""
@@ -18,6 +18,7 @@
     )
 from lp.registry.interfaces.product import IProductSet
 from lp.testing import (
+    person_logged_in,
     ANONYMOUS,
     login,
     logout,
@@ -57,7 +58,7 @@
     def testMilestoneSetGetIDs(self):
         """Test of MilestoneSet.getByIds()"""
         milestone_set = getUtility(IMilestoneSet)
-        milestones = milestone_set.getByIds([1,3])
+        milestones = milestone_set.getByIds([1, 3])
         ids = sorted(map(attrgetter('id'), milestones))
         self.assertEqual([1, 3], ids)
 
@@ -128,3 +129,49 @@
     def test_projectgroup(self):
         projectgroup = self.factory.makeProject()
         self.check_skipped(projectgroup)
+
+
+class MilestoneBugTaskSpecificationTest(TestCaseWithFactory):
+    """Test cases for retrieving bugtasks and specifications for a milestone.
+    """
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(MilestoneBugTaskSpecificationTest, self).setUp()
+        self.owner = self.factory.makePerson()
+        self.product = self.factory.makeProduct(name="product1")
+        self.milestone = self.factory.makeMilestone(product=self.product)
+
+    def _make_bug(self, **kwargs):
+        milestone = kwargs.pop('milestone', None)
+        bugtask = self.factory.makeBugTask(**kwargs)
+        bugtask.milestone = milestone
+        return bugtask
+
+    def _create_items(self, num, factory, **kwargs):
+        items = []
+        with person_logged_in(self.owner):
+            for n in xrange(num):
+                items.append(factory(**kwargs))
+        return items
+
+    def test_bugtask_retrieval(self):
+        # Ensure that all bugtasks on a milestone can be retrieved.
+        bugtasks = self._create_items(
+            5, self._make_bug,
+            milestone=self.milestone,
+            owner=self.owner,
+            target=self.product,
+            )
+        self.assertContentEqual(bugtasks, self.milestone.bugtasks(self.owner))
+
+    def test_specification_retrieval(self):
+        # Ensure that all specifications on a milestone can be retrieved.
+        specifications = self._create_items(
+            5, self.factory.makeSpecification,
+            milestone=self.milestone,
+            owner=self.owner,
+            product=self.product,
+            )
+        self.assertContentEqual(specifications, self.milestone.specifications)

=== added file 'lib/lp/registry/tests/test_milestonetag.py'
--- lib/lp/registry/tests/test_milestonetag.py	1970-01-01 00:00:00 +0000
+++ lib/lp/registry/tests/test_milestonetag.py	2012-01-09 13:42:13 +0000
@@ -0,0 +1,202 @@
+# Copyright 2011 Canonical Ltd.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE).
+
+"""Milestone related test helper."""
+
+__metaclass__ = type
+
+import datetime
+
+from lp.testing.layers import (
+    DatabaseFunctionalLayer,
+    )
+from lp.registry.model.milestonetag import (
+    MilestoneTag,
+    ProjectGroupMilestoneTag,
+    )
+from lp.testing import (
+    person_logged_in,
+    TestCaseWithFactory,
+    )
+
+
+class MilestoneTagTest(TestCaseWithFactory):
+    """Test cases for setting and retrieving milestone tags."""
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(MilestoneTagTest, self).setUp()
+        self.milestone = self.factory.makeMilestone()
+        self.person = self.milestone.target.owner
+        self.tags = [u'tag2', u'tag1', u'tag3']
+
+    def test_no_tags(self):
+        # Ensure a newly created milestone does not have associated tags.
+        self.assertEquals([], list(self.milestone.getTags()))
+
+    def test_tags_setting_and_retrieval(self):
+        # Ensure tags are correctly saved and retrieved from the db.
+        with person_logged_in(self.person):
+            self.milestone.setTags(self.tags, self.person)
+        self.assertEqual(sorted(self.tags), list(self.milestone.getTags()))
+
+    def test_tags_override(self):
+        # Ensure you can override tags already associated with the milestone.
+        with person_logged_in(self.person):
+            self.milestone.setTags(self.tags, self.person)
+            new_tags = [u'tag2', u'tag4', u'tag3']
+            self.milestone.setTags(new_tags, self.person)
+        self.assertEqual(sorted(new_tags), list(self.milestone.getTags()))
+
+    def test_tags_deletion(self):
+        # Ensure passing an empty sequence of tags deletes them all.
+        with person_logged_in(self.person):
+            self.milestone.setTags(self.tags, self.person)
+            self.milestone.setTags([], self.person)
+        self.assertEquals([], list(self.milestone.getTags()))
+
+    def test_user_metadata(self):
+        # Ensure the correct user metadata is created when tags are added.
+        tag = u'tag1'
+        with person_logged_in(self.person):
+            self.milestone.setTags([tag], self.person)
+        values = self.milestone.getTagsData().values(
+            MilestoneTag.created_by_id,
+            MilestoneTag.date_created,
+            )
+        created_by_id, date_created = values.next()
+        self.assertEqual(self.person.id, created_by_id)
+        self.assertIsInstance(date_created, datetime.datetime)
+
+    def test_user_metadata_override(self):
+        # Ensure the user metadata is correct when tags are saved
+        # multiple times by different users.
+        new_person = self.factory.makePerson()
+        with person_logged_in(self.person):
+            self.milestone.setTags(self.tags, self.person)
+            new_tags = [u'tag2', u'tag4', u'tag3']
+            self.milestone.setTags(new_tags, new_person)
+        values = self.milestone.getTagsData().values(
+            MilestoneTag.tag,
+            MilestoneTag.created_by_id,
+            )
+        tag_person_map = dict(values)
+        # Old tags are still created by self.person.
+        for tag in set(self.tags).intersection(new_tags):
+            self.assertEqual(self.person.id, tag_person_map[tag])
+        # Only new tags are created by new_person.
+        for tag in set(new_tags).difference(self.tags):
+            self.assertEqual(new_person.id, tag_person_map[tag])
+
+
+class ProjectGroupMilestoneTagTest(TestCaseWithFactory):
+    """Test cases for retrieving bugtasks for a milestonetag."""
+
+    layer = DatabaseFunctionalLayer
+
+    def setUp(self):
+        super(ProjectGroupMilestoneTagTest, self).setUp()
+        self.owner = self.factory.makePerson()
+        self.project_group = self.factory.makeProject(owner=self.owner)
+        self.product = self.factory.makeProduct(
+            name="product1",
+            owner=self.owner,
+            project=self.project_group)
+        self.milestone = self.factory.makeMilestone(product=self.product)
+
+    def _create_bugtasks(self, num, milestone=None):
+        bugtasks = []
+        with person_logged_in(self.owner):
+            for n in xrange(num):
+                bugtask = self.factory.makeBugTask(
+                    target=self.product,
+                    owner=self.owner)
+                if milestone:
+                    bugtask.milestone = milestone
+                bugtasks.append(bugtask)
+        return bugtasks
+
+    def _create_specifications(self, num, milestone=None):
+        specifications = []
+        with person_logged_in(self.owner):
+            for n in xrange(num):
+                specification = self.factory.makeSpecification(
+                    product=self.product,
+                    owner=self.owner,
+                    milestone=milestone)
+                specifications.append(specification)
+        return specifications
+
+    def _create_items_for_retrieval(self, factory, tag=u'tag1'):
+        with person_logged_in(self.owner):
+            self.milestone.setTags([tag], self.owner)
+            items = factory(5, self.milestone)
+            milestonetag = ProjectGroupMilestoneTag(
+                target=self.project_group, tags=[tag])
+        return items, milestonetag
+
+    def _create_items_for_untagged_milestone(self, factory, tag=u'tag1'):
+        new_milestone = self.factory.makeMilestone(product=self.product)
+        with person_logged_in(self.owner):
+            self.milestone.setTags([tag], self.owner)
+            items = factory(5, self.milestone)
+            factory(3, new_milestone)
+            milestonetag = ProjectGroupMilestoneTag(
+                target=self.project_group, tags=[tag])
+        return items, milestonetag
+
+    def _create_items_for_multiple_tags(
+        self, factory, tags=(u'tag1', u'tag2')):
+        new_milestone = self.factory.makeMilestone(product=self.product)
+        with person_logged_in(self.owner):
+            self.milestone.setTags(tags, self.owner)
+            new_milestone.setTags(tags[:1], self.owner)
+            items = factory(5, self.milestone)
+            factory(3, new_milestone)
+            milestonetag = ProjectGroupMilestoneTag(
+                target=self.project_group, tags=tags)
+        return items, milestonetag
+
+    # Add a test similar to TestProjectExcludeConjoinedMasterSearch in
+    # lp.bugs.tests.test_bugsearch_conjoined.
+
+    def test_bugtask_retrieve_single_milestone(self):
+        # Ensure that all bugtasks on a single milestone can be retrieved.
+        bugtasks, milestonetag = self._create_items_for_retrieval(
+            self._create_bugtasks)
+        self.assertContentEqual(bugtasks, milestonetag.bugtasks(self.owner))
+
+    def test_bugtasks_for_untagged_milestone(self):
+        # Ensure that bugtasks for a project group are retrieved
+        # only if associated with milestones having specified tags.
+        bugtasks, milestonetag = self._create_items_for_untagged_milestone(
+            self._create_bugtasks)
+        self.assertContentEqual(bugtasks, milestonetag.bugtasks(self.owner))
+
+    def test_bugtasks_multiple_tags(self):
+        # Ensure that, in presence of multiple tags, only bugtasks
+        # for milestones associated with all the tags are retrieved.
+        bugtasks, milestonetag = self._create_items_for_multiple_tags(
+            self._create_bugtasks)
+        self.assertContentEqual(bugtasks, milestonetag.bugtasks(self.owner))
+
+    def test_specification_retrieval(self):
+        # Ensure that all specifications on a milestone can be retrieved.
+        specs, milestonetag = self._create_items_for_retrieval(
+            self._create_specifications)
+        self.assertContentEqual(specs, milestonetag.specifications)
+
+    def test_specifications_for_untagged_milestone(self):
+        # Ensure that specifications for a project group are retrieved
+        # only if associated with milestones having specified tags.
+        specs, milestonetag = self._create_items_for_untagged_milestone(
+            self._create_specifications)
+        self.assertContentEqual(specs, milestonetag.specifications)
+
+    def test_specifications_multiple_tags(self):
+        # Ensure that, in presence of multiple tags, only specifications
+        # for milestones associated with all the tags are retrieved.
+        specs, milestonetag = self._create_items_for_multiple_tags(
+            self._create_specifications)
+        self.assertContentEqual(specs, milestonetag.specifications)

=== modified file 'lib/lp/registry/tests/test_person.py'
--- lib/lp/registry/tests/test_person.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/tests/test_person.py	2012-01-09 10:08:02 +0000
@@ -19,31 +19,8 @@
 from zope.security.interfaces import Unauthorized
 from zope.security.proxy import removeSecurityProxy
 
-<<<<<<< TREE
 from lazr.lifecycle.snapshot import Snapshot
 
-=======
-from canonical.config import config
-from canonical.database.sqlbase import cursor, sqlvalues
-from canonical.launchpad.database.account import Account
-from canonical.launchpad.database.emailaddress import EmailAddress
-from canonical.launchpad.interfaces.account import (
-    AccountCreationRationale,
-    AccountStatus,
-    )
-from canonical.launchpad.interfaces.emailaddress import (
-    EmailAddressAlreadyTaken,
-    EmailAddressStatus,
-    IEmailAddressSet,
-    InvalidEmailAddress,
-    )
-from canonical.launchpad.interfaces.lpstorm import (
-    IMasterStore,
-    IStore,
-    )
-from canonical.launchpad.testing.pages import LaunchpadWebServiceCaller
-from canonical.testing.layers import DatabaseFunctionalLayer
->>>>>>> MERGE-SOURCE
 from lp.answers.model.answercontact import AnswerContact
 from lp.app.interfaces.launchpad import ILaunchpadCelebrities
 from lp.blueprints.model.specification import Specification
@@ -69,34 +46,12 @@
     get_recipients,
     Person,
     )
-<<<<<<< TREE
-from lp.services.identity.interfaces.account import (
-    AccountStatus,
-    )
-from lp.services.identity.interfaces.emailaddress import (
-    EmailAddressStatus,
-    )
-=======
-from lp.services.config import config
-from lp.services.database.lpstorm import (
-    IMasterStore,
-    IStore,
-    )
-from lp.services.database.sqlbase import cursor
-from lp.services.identity.interfaces.account import (
-    AccountCreationRationale,
-    AccountStatus,
-    )
-from lp.services.identity.interfaces.emailaddress import (
-    EmailAddressAlreadyTaken,
-    EmailAddressStatus,
-    IEmailAddressSet,
-    InvalidEmailAddress,
-    )
-from lp.services.identity.model.account import Account
-from lp.services.identity.model.emailaddress import EmailAddress
-from lp.services.openid.model.openididentifier import OpenIdIdentifier
->>>>>>> MERGE-SOURCE
+from lp.services.identity.interfaces.account import (
+    AccountStatus,
+    )
+from lp.services.identity.interfaces.emailaddress import (
+    EmailAddressStatus,
+    )
 from lp.services.propertycache import clear_property_cache
 from lp.soyuz.enums import (
     ArchivePurpose,
@@ -761,761 +716,6 @@
         self.assertEqual('(\\u0170-tester)>', displayname)
 
 
-<<<<<<< TREE
-=======
-class TestPersonSet(TestCaseWithFactory):
-    """Test `IPersonSet`."""
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        super(TestPersonSet, self).setUp()
-        login(ANONYMOUS)
-        self.addCleanup(logout)
-        self.person_set = getUtility(IPersonSet)
-
-    def test_isNameBlacklisted(self):
-        cursor().execute(
-            "INSERT INTO NameBlacklist(id, regexp) VALUES (-100, 'foo')")
-        self.failUnless(self.person_set.isNameBlacklisted('foo'))
-        self.failIf(self.person_set.isNameBlacklisted('bar'))
-
-    def test_isNameBlacklisted_user_is_admin(self):
-        team = self.factory.makeTeam()
-        name_blacklist_set = getUtility(INameBlacklistSet)
-        self.admin_exp = name_blacklist_set.create(u'fnord', admin=team)
-        self.store = IStore(self.admin_exp)
-        self.store.flush()
-        user = team.teamowner
-        self.assertFalse(self.person_set.isNameBlacklisted('fnord', user))
-
-    def test_getByEmail_ignores_case_and_whitespace(self):
-        person1_email = '[e-mail]'
-        person1 = self.person_set.getByEmail(person1_email)
-        self.failIf(
-            person1 is None,
-            "PersonSet.getByEmail() could not find %r" % person1_email)
-
-        person2 = self.person_set.getByEmail('  [e-mail]  ')
-        self.failIf(
-            person2 is None,
-            "PersonSet.getByEmail() should ignore case and whitespace.")
-        self.assertEqual(person1, person2)
-
-    def test_getPrecachedPersonsFromIDs(self):
-        # The getPrecachedPersonsFromIDs() method should only make one
-        # query to load all the extraneous data. Accessing the
-        # attributes should then cause zero queries.
-        person_ids = [
-            self.factory.makePerson().id
-            for i in range(3)]
-
-        with StormStatementRecorder() as recorder:
-            persons = list(self.person_set.getPrecachedPersonsFromIDs(
-                person_ids, need_karma=True, need_ubuntu_coc=True,
-                need_location=True, need_archive=True,
-                need_preferred_email=True, need_validity=True))
-        self.assertThat(recorder, HasQueryCount(LessThan(2)))
-
-        with StormStatementRecorder() as recorder:
-            for person in persons:
-                person.is_valid_person
-                person.karma
-                person.is_ubuntu_coc_signer
-                person.location
-                person.archive
-                person.preferredemail
-        self.assertThat(recorder, HasQueryCount(LessThan(1)))
-
-
-class KarmaTestMixin:
-    """Helper methods for setting karma."""
-
-    def _makeKarmaCache(self, person, product, category_name_values):
-        """Create a KarmaCache entry with the given arguments.
-
-        In order to create the KarmaCache record we must switch to the DB
-        user 'karma'. This invalidates the objects under test so they
-        must be retrieved again.
-        """
-        with dbuser('karma'):
-            total = 0
-            # Insert category total for person and project.
-            for category_name, value in category_name_values:
-                category = KarmaCategory.byName(category_name)
-                self.cache_manager.new(
-                    value, person.id, category.id, product_id=product.id)
-                total += value
-            # Insert total cache for person and project.
-            self.cache_manager.new(
-                total, person.id, None, product_id=product.id)
-
-    def _makeKarmaTotalCache(self, person, total):
-        """Create a KarmaTotalCache entry.
-
-        In order to create the KarmaTotalCache record we must switch to the DB
-        user 'karma'. This invalidates the objects under test so they
-        must be retrieved again.
-        """
-        with dbuser('karma'):
-            KarmaTotalCache(person=person.id, karma_total=total)
-
-
-class TestPersonSetMerge(TestCaseWithFactory, KarmaTestMixin):
-    """Test cases for PersonSet merge."""
-
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        super(TestPersonSetMerge, self).setUp()
-        self.person_set = getUtility(IPersonSet)
-
-    def _do_premerge(self, from_person, to_person):
-        # Do the pre merge work performed by the LoginToken.
-        with celebrity_logged_in('admin'):
-            email = from_person.preferredemail
-            email.status = EmailAddressStatus.NEW
-            store = IMasterStore(EmailAddress)
-            # EmailAddress.acount and .person need to be updated at the
-            # same time to prevent the constraints on the account field
-            # from kicking the change out.
-            store.execute("""
-                UPDATE EmailAddress SET
-                    person = %s,
-                    account = %s
-                WHERE id = %s
-                """ % sqlvalues(
-                to_person.id, to_person.accountID, email.id))
-        transaction.commit()
-
-    def _do_merge(self, from_person, to_person, reviewer=None):
-        # Perform the merge as the db user that will be used by the jobs.
-        with dbuser(config.IPersonMergeJobSource.dbuser):
-            self.person_set.merge(from_person, to_person, reviewer=reviewer)
-        return from_person, to_person
-
-    def _get_testable_account(self, person, date_created, openid_identifier):
-        # Return a naked account with predictable attributes.
-        account = removeSecurityProxy(person.account)
-        account.date_created = date_created
-        account.openid_identifier = openid_identifier
-        return account
-
-    def test_delete_no_notifications(self):
-        team = self.factory.makeTeam()
-        owner = team.teamowner
-        transaction.commit()
-        with dbuser(config.IPersonMergeJobSource.dbuser):
-            self.person_set.delete(team, owner)
-        notification_set = getUtility(IPersonNotificationSet)
-        notifications = notification_set.getNotificationsToSend()
-        self.assertEqual(0, notifications.count())
-
-    def test_openid_identifiers(self):
-        # Verify that OpenId Identifiers are merged.
-        duplicate = self.factory.makePerson()
-        duplicate_identifier = removeSecurityProxy(
-            duplicate.account).openid_identifiers.any().identifier
-        person = self.factory.makePerson()
-        person_identifier = removeSecurityProxy(
-            person.account).openid_identifiers.any().identifier
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        self.assertEqual(
-            0,
-            removeSecurityProxy(duplicate.account).openid_identifiers.count())
-
-        merged_identifiers = [
-            identifier.identifier for identifier in
-                removeSecurityProxy(person.account).openid_identifiers]
-
-        self.assertIn(duplicate_identifier, merged_identifiers)
-        self.assertIn(person_identifier, merged_identifiers)
-
-    def test_karmacache_transferred_to_user_has_no_karma(self):
-        # Verify that the merged user has no KarmaCache entries,
-        # and the karma total was transfered.
-        self.cache_manager = getUtility(IKarmaCacheManager)
-        product = self.factory.makeProduct()
-        duplicate = self.factory.makePerson()
-        self._makeKarmaCache(
-            duplicate, product, [('bugs', 10)])
-        self._makeKarmaTotalCache(duplicate, 15)
-        # The karma changes invalidated duplicate instance.
-        duplicate = self.person_set.get(duplicate.id)
-        person = self.factory.makePerson()
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        self.assertEqual([], duplicate.karma_category_caches)
-        self.assertEqual(0, duplicate.karma)
-        self.assertEqual(15, person.karma)
-
-    def test_karmacache_transferred_to_user_has_karma(self):
-        # Verify that the merged user has no KarmaCache entries,
-        # and the karma total was summed.
-        self.cache_manager = getUtility(IKarmaCacheManager)
-        product = self.factory.makeProduct()
-        duplicate = self.factory.makePerson()
-        self._makeKarmaCache(
-            duplicate, product, [('bugs', 10)])
-        self._makeKarmaTotalCache(duplicate, 15)
-        person = self.factory.makePerson()
-        self._makeKarmaCache(
-            person, product, [('bugs', 9)])
-        self._makeKarmaTotalCache(person, 13)
-        # The karma changes invalidated duplicate and person instances.
-        duplicate = self.person_set.get(duplicate.id)
-        person = self.person_set.get(person.id)
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        self.assertEqual([], duplicate.karma_category_caches)
-        self.assertEqual(0, duplicate.karma)
-        self.assertEqual(28, person.karma)
-
-    def test_person_date_created_preserved(self):
-        # Verify that the oldest datecreated is merged.
-        person = self.factory.makePerson()
-        duplicate = self.factory.makePerson()
-        oldest_date = datetime(
-            2005, 11, 25, 0, 0, 0, 0, pytz.timezone('UTC'))
-        removeSecurityProxy(duplicate).datecreated = oldest_date
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        self.assertEqual(oldest_date, person.datecreated)
-
-    def test_team_with_active_mailing_list_raises_error(self):
-        # A team with an active mailing list cannot be merged.
-        target_team = self.factory.makeTeam()
-        test_team = self.factory.makeTeam()
-        self.factory.makeMailingList(
-            test_team, test_team.teamowner)
-        self.assertRaises(
-            AssertionError, self.person_set.merge, test_team, target_team)
-
-    def test_team_with_inactive_mailing_list(self):
-        # A team with an inactive mailing list can be merged.
-        target_team = self.factory.makeTeam()
-        test_team = self.factory.makeTeam()
-        mailing_list = self.factory.makeMailingList(
-            test_team, test_team.teamowner)
-        mailing_list.deactivate()
-        mailing_list.transitionToStatus(MailingListStatus.INACTIVE)
-        test_team, target_team = self._do_merge(
-            test_team, target_team, test_team.teamowner)
-        self.assertEqual(target_team, test_team.merged)
-        self.assertEqual(
-            MailingListStatus.PURGED, test_team.mailing_list.status)
-        emails = getUtility(IEmailAddressSet).getByPerson(target_team).count()
-        self.assertEqual(0, emails)
-
-    def test_team_with_purged_mailing_list(self):
-        # A team with a purges mailing list can be merged.
-        target_team = self.factory.makeTeam()
-        test_team = self.factory.makeTeam()
-        mailing_list = self.factory.makeMailingList(
-            test_team, test_team.teamowner)
-        mailing_list.deactivate()
-        mailing_list.transitionToStatus(MailingListStatus.INACTIVE)
-        mailing_list.purge()
-        test_team, target_team = self._do_merge(
-            test_team, target_team, test_team.teamowner)
-        self.assertEqual(target_team, test_team.merged)
-
-    def test_team_with_members(self):
-        # Team members are removed before merging.
-        target_team = self.factory.makeTeam()
-        test_team = self.factory.makeTeam()
-        former_member = self.factory.makePerson()
-        with person_logged_in(test_team.teamowner):
-            test_team.addMember(former_member, test_team.teamowner)
-        test_team, target_team = self._do_merge(
-            test_team, target_team, test_team.teamowner)
-        self.assertEqual(target_team, test_team.merged)
-        self.assertEqual([], list(former_member.super_teams))
-
-    def test_team_without_super_teams_is_fine(self):
-        # A team with no members and no super teams
-        # merges without errors.
-        test_team = self.factory.makeTeam()
-        target_team = self.factory.makeTeam()
-        login_person(test_team.teamowner)
-        self._do_merge(test_team, target_team, test_team.teamowner)
-
-    def test_team_with_super_teams(self):
-        # A team with superteams can be merged, but the memberships
-        # are not transferred.
-        test_team = self.factory.makeTeam()
-        super_team = self.factory.makeTeam()
-        target_team = self.factory.makeTeam()
-        login_person(test_team.teamowner)
-        test_team.join(super_team, test_team.teamowner)
-        test_team, target_team = self._do_merge(
-            test_team, target_team, test_team.teamowner)
-        self.assertEqual(target_team, test_team.merged)
-        self.assertEqual([], list(target_team.super_teams))
-
-    def test_merge_moves_branches(self):
-        # When person/teams are merged, branches owned by the from person
-        # are moved.
-        person = self.factory.makePerson()
-        branch = self.factory.makeBranch()
-        duplicate = branch.owner
-        self._do_premerge(branch.owner, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        branches = person.getBranches()
-        self.assertEqual(1, branches.count())
-
-    def test_merge_with_duplicated_branches(self):
-        # If both the from and to people have branches with the same name,
-        # merging renames the duplicate from the from person's side.
-        product = self.factory.makeProduct()
-        from_branch = self.factory.makeBranch(name='foo', product=product)
-        to_branch = self.factory.makeBranch(name='foo', product=product)
-        mergee = to_branch.owner
-        duplicate = from_branch.owner
-        self._do_premerge(duplicate, mergee)
-        login_person(mergee)
-        duplicate, mergee = self._do_merge(duplicate, mergee)
-        branches = [b.name for b in mergee.getBranches()]
-        self.assertEqual(2, len(branches))
-        self.assertContentEqual([u'foo', u'foo-1'], branches)
-
-    def test_merge_moves_recipes(self):
-        # When person/teams are merged, recipes owned by the from person are
-        # moved.
-        person = self.factory.makePerson()
-        recipe = self.factory.makeSourcePackageRecipe()
-        duplicate = recipe.owner
-        # Delete the PPA, which is required for the merge to work.
-        with person_logged_in(duplicate):
-            recipe.owner.archive.status = ArchiveStatus.DELETED
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        self.assertEqual(1, person.recipes.count())
-
-    def test_merge_with_duplicated_recipes(self):
-        # If both the from and to people have recipes with the same name,
-        # merging renames the duplicate from the from person's side.
-        merge_from = self.factory.makeSourcePackageRecipe(
-            name=u'foo', description=u'FROM')
-        merge_to = self.factory.makeSourcePackageRecipe(
-            name=u'foo', description=u'TO')
-        duplicate = merge_from.owner
-        mergee = merge_to.owner
-        # Delete merge_from's PPA, which is required for the merge to work.
-        with person_logged_in(merge_from.owner):
-            merge_from.owner.archive.status = ArchiveStatus.DELETED
-        self._do_premerge(merge_from.owner, mergee)
-        login_person(mergee)
-        duplicate, mergee = self._do_merge(duplicate, mergee)
-        recipes = mergee.recipes
-        self.assertEqual(2, recipes.count())
-        descriptions = [r.description for r in recipes]
-        self.assertEqual([u'TO', u'FROM'], descriptions)
-        self.assertEqual(u'foo-1', recipes[1].name)
-
-    def assertSubscriptionMerges(self, target):
-        # Given a subscription target, we want to make sure that subscriptions
-        # that the duplicate person made are carried over to the merged
-        # account.
-        duplicate = self.factory.makePerson()
-        with person_logged_in(duplicate):
-            target.addSubscription(duplicate, duplicate)
-        person = self.factory.makePerson()
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        # The merged person has the subscription, and the duplicate person
-        # does not.
-        self.assertTrue(target.getSubscription(person) is not None)
-        self.assertTrue(target.getSubscription(duplicate) is None)
-
-    def assertConflictingSubscriptionDeletes(self, target):
-        # Given a subscription target, we want to make sure that subscriptions
-        # that the duplicate person made that conflict with existing
-        # subscriptions in the merged account are deleted.
-        duplicate = self.factory.makePerson()
-        person = self.factory.makePerson()
-        with person_logged_in(duplicate):
-            target.addSubscription(duplicate, duplicate)
-        with person_logged_in(person):
-            # The description lets us show that we still have the right
-            # subscription later.
-            target.addBugSubscriptionFilter(person, person).description = (
-                u'a marker')
-        self._do_premerge(duplicate, person)
-        login_person(person)
-        duplicate, person = self._do_merge(duplicate, person)
-        # The merged person still has the original subscription, as shown
-        # by the marker name.
-        self.assertEqual(
-            target.getSubscription(person).bug_filters[0].description,
-            u'a marker')
-        # The conflicting subscription on the duplicate has been deleted.
-        self.assertTrue(target.getSubscription(duplicate) is None)
-
-    def test_merge_with_product_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeProduct())
-
-    def test_merge_with_conflicting_product_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(self.factory.makeProduct())
-
-    def test_merge_with_project_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeProject())
-
-    def test_merge_with_conflicting_project_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(self.factory.makeProject())
-
-    def test_merge_with_distroseries_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeDistroSeries())
-
-    def test_merge_with_conflicting_distroseries_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(
-            self.factory.makeDistroSeries())
-
-    def test_merge_with_milestone_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeMilestone())
-
-    def test_merge_with_conflicting_milestone_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(
-            self.factory.makeMilestone())
-
-    def test_merge_with_productseries_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeProductSeries())
-
-    def test_merge_with_conflicting_productseries_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(
-            self.factory.makeProductSeries())
-
-    def test_merge_with_distribution_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        self.assertSubscriptionMerges(self.factory.makeDistribution())
-
-    def test_merge_with_conflicting_distribution_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        self.assertConflictingSubscriptionDeletes(
-            self.factory.makeDistribution())
-
-    def test_merge_with_sourcepackage_subscription(self):
-        # See comments in assertSubscriptionMerges.
-        dsp = self.factory.makeDistributionSourcePackage()
-        self.assertSubscriptionMerges(dsp)
-
-    def test_merge_with_conflicting_sourcepackage_subscription(self):
-        # See comments in assertConflictingSubscriptionDeletes.
-        dsp = self.factory.makeDistributionSourcePackage()
-        self.assertConflictingSubscriptionDeletes(dsp)
-
-    def test_merge_accesspolicygrants(self):
-        # AccessPolicyGrants are transferred from the duplicate.
-        person = self.factory.makePerson()
-        grant = self.factory.makeAccessPolicyGrant()
-        self._do_premerge(grant.grantee, person)
-        with person_logged_in(person):
-            self._do_merge(grant.grantee, person)
-        self.assertEqual(person, grant.grantee)
-
-    def test_merge_accesspolicygrants_conflicts(self):
-        # Conflicting AccessPolicyGrants are deleted.
-        policy = self.factory.makeAccessPolicy()
-
-        person = self.factory.makePerson()
-        person_grantor = self.factory.makePerson()
-        person_grant = self.factory.makeAccessPolicyGrant(
-            grantee=person, grantor=person_grantor, object=policy)
-
-        duplicate = self.factory.makePerson()
-        duplicate_grantor = self.factory.makePerson()
-        duplicate_grant = self.factory.makeAccessPolicyGrant(
-            grantee=duplicate, grantor=duplicate_grantor, object=policy)
-
-        self._do_premerge(duplicate, person)
-        with person_logged_in(person):
-            self._do_merge(duplicate, person)
-        transaction.commit()
-
-        self.assertEqual(person, person_grant.grantee)
-        self.assertEqual(person_grantor, person_grant.grantor)
-        self.assertIs(
-            None,
-            IStore(AccessPolicyGrant).get(
-                AccessPolicyGrant, duplicate_grant.id))
-
-    def test_mergeAsync(self):
-        # mergeAsync() creates a new `PersonMergeJob`.
-        from_person = self.factory.makePerson()
-        to_person = self.factory.makePerson()
-        login_person(from_person)
-        job = self.person_set.mergeAsync(from_person, to_person)
-        self.assertEqual(from_person, job.from_person)
-        self.assertEqual(to_person, job.to_person)
-
-
-class TestPersonSetCreateByOpenId(TestCaseWithFactory):
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        super(TestPersonSetCreateByOpenId, self).setUp()
-        self.person_set = getUtility(IPersonSet)
-        self.store = IMasterStore(Account)
-
-        # Generate some valid test data.
-        self.account = self.makeAccount()
-        self.identifier = self.makeOpenIdIdentifier(self.account, u'whatever')
-        self.person = self.makePerson(self.account)
-        self.email = self.makeEmailAddress(
-            email='[e-mail]',
-            account=self.account, person=self.person)
-
-    def makeAccount(self):
-        return self.store.add(Account(
-            displayname='Displayname',
-            creation_rationale=AccountCreationRationale.UNKNOWN,
-            status=AccountStatus.ACTIVE))
-
-    def makeOpenIdIdentifier(self, account, identifier):
-        openid_identifier = OpenIdIdentifier()
-        openid_identifier.identifier = identifier
-        openid_identifier.account = account
-        return self.store.add(openid_identifier)
-
-    def makePerson(self, account):
-        return self.store.add(Person(
-            name='acc%d' % account.id, account=account,
-            displayname='Displayname',
-            creation_rationale=PersonCreationRationale.UNKNOWN))
-
-    def makeEmailAddress(self, email, account, person):
-            return self.store.add(EmailAddress(
-                email=email,
-                account=account,
-                person=person,
-                status=EmailAddressStatus.PREFERRED))
-
-    def testAllValid(self):
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            self.identifier.identifier, self.email.email, 'Ignored Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(False, updated)
-        self.assertIs(self.person, found)
-        self.assertIs(self.account, found.account)
-        self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
-        self.assertIs(self.email.person, self.person)
-        self.assertEqual(
-            [self.identifier], list(self.account.openid_identifiers))
-
-    def testEmailAddressCaseInsensitive(self):
-        # As per testAllValid, but the email address used for the lookup
-        # is all upper case.
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            self.identifier.identifier, self.email.email.upper(),
-            'Ignored Name', PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(False, updated)
-        self.assertIs(self.person, found)
-        self.assertIs(self.account, found.account)
-        self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
-        self.assertIs(self.email.person, self.person)
-        self.assertEqual(
-            [self.identifier], list(self.account.openid_identifiers))
-
-    def testNewOpenId(self):
-        # Account looked up by email and the new OpenId identifier
-        # attached. We can do this because we trust our OpenId Provider.
-        new_identifier = u'newident'
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            new_identifier, self.email.email, 'Ignored Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(True, updated)
-        self.assertIs(self.person, found)
-        self.assertIs(self.account, found.account)
-        self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
-        self.assertIs(self.email.person, self.person)
-
-        # Old OpenId Identifier still attached.
-        self.assertIn(self.identifier, list(self.account.openid_identifiers))
-
-        # So is our new one.
-        identifiers = [
-            identifier.identifier for identifier
-                in self.account.openid_identifiers]
-        self.assertIn(new_identifier, identifiers)
-
-    def testNewEmailAddress(self):
-        # Account looked up by OpenId identifier and new EmailAddress
-        # attached. We can do this because we trust our OpenId Provider.
-        new_email = u'[e-mail]'
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            self.identifier.identifier, new_email, 'Ignored Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(True, updated)
-        self.assertIs(self.person, found)
-        self.assertIs(self.account, found.account)
-        self.assertEqual(
-            [self.identifier], list(self.account.openid_identifiers))
-
-        # The old email address is still there and correctly linked.
-        self.assertIs(self.email, found.preferredemail)
-        self.assertIs(self.email.account, self.account)
-        self.assertIs(self.email.person, self.person)
-
-        # The new email address is there too and correctly linked.
-        new_email = self.store.find(EmailAddress, email=new_email).one()
-        self.assertIs(new_email.account, self.account)
-        self.assertIs(new_email.person, self.person)
-        self.assertEqual(EmailAddressStatus.NEW, new_email.status)
-
-    def testNewAccountAndIdentifier(self):
-        # If neither the OpenId Identifier nor the email address are
-        # found, we create everything.
-        new_email = u'[e-mail]'
-        new_identifier = u'new_identifier'
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            new_identifier, new_email, 'New Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        # We have a new Person
-        self.assertIs(True, updated)
-        self.assertIsNot(None, found)
-
-        # It is correctly linked to an account, emailaddress and
-        # identifier.
-        self.assertIs(found, found.preferredemail.person)
-        self.assertIs(found.account, found.preferredemail.account)
-        self.assertEqual(
-            new_identifier, found.account.openid_identifiers.any().identifier)
-
-    def testNoPerson(self):
-        # If the account is not linked to a Person, create one. ShipIt
-        # users fall into this category the first time they log into
-        # Launchpad.
-        self.email.person = None
-        self.person.account = None
-
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            self.identifier.identifier, self.email.email, 'New Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        # We have a new Person
-        self.assertIs(True, updated)
-        self.assertIsNot(self.person, found)
-
-        # It is correctly linked to an account, emailaddress and
-        # identifier.
-        self.assertIs(found, found.preferredemail.person)
-        self.assertIs(found.account, found.preferredemail.account)
-        self.assertIn(self.identifier, list(found.account.openid_identifiers))
-
-    def testNoAccount(self):
-        # EmailAddress is linked to a Person, but there is no Account.
-        # Convert this stub into something valid.
-        self.email.account = None
-        self.email.status = EmailAddressStatus.NEW
-        self.person.account = None
-        new_identifier = u'new_identifier'
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            new_identifier, self.email.email, 'Ignored',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(True, updated)
-
-        self.assertIsNot(None, found.account)
-        self.assertEqual(
-            new_identifier, found.account.openid_identifiers.any().identifier)
-        self.assertIs(self.email.person, found)
-        self.assertIs(self.email.account, found.account)
-        self.assertEqual(EmailAddressStatus.PREFERRED, self.email.status)
-
-    def testMovedEmailAddress(self):
-        # The EmailAddress and OpenId Identifier are both in the
-        # database, but they are not linked to the same account. The
-        # identifier needs to be relinked to the correct account - the
-        # user able to log into the trusted SSO with that email address
-        # should be able to log into Launchpad with that email address.
-        # This lets us cope with the SSO migrating email addresses
-        # between SSO accounts.
-        self.identifier.account = self.store.find(
-            Account, displayname='Foo Bar').one()
-
-        found, updated = self.person_set.getOrCreateByOpenIDIdentifier(
-            self.identifier.identifier, self.email.email, 'New Name',
-            PersonCreationRationale.UNKNOWN, 'No Comment')
-        found = removeSecurityProxy(found)
-
-        self.assertIs(True, updated)
-        self.assertIs(self.person, found)
-
-        self.assertIs(found.account, self.identifier.account)
-        self.assertIn(self.identifier, list(found.account.openid_identifiers))
-
-
-class TestCreatePersonAndEmail(TestCase):
-    """Test `IPersonSet`.createPersonAndEmail()."""
-    layer = DatabaseFunctionalLayer
-
-    def setUp(self):
-        TestCase.setUp(self)
-        login(ANONYMOUS)
-        self.addCleanup(logout)
-        self.person_set = getUtility(IPersonSet)
-
-    def test_duplicated_name_not_accepted(self):
-        self.person_set.createPersonAndEmail(
-            '[e-mail]', PersonCreationRationale.UNKNOWN,
-            name='zzzz')
-        self.assertRaises(
-            NameAlreadyTaken, self.person_set.createPersonAndEmail,
-            '[e-mail]', PersonCreationRationale.UNKNOWN,
-            name='zzzz')
-
-    def test_duplicated_email_not_accepted(self):
-        self.person_set.createPersonAndEmail(
-            '[e-mail]', PersonCreationRationale.UNKNOWN)
-        self.assertRaises(
-            EmailAddressAlreadyTaken, self.person_set.createPersonAndEmail,
-            '[e-mail]', PersonCreationRationale.UNKNOWN)
-
-    def test_invalid_email_not_accepted(self):
-        self.assertRaises(
-            InvalidEmailAddress, self.person_set.createPersonAndEmail,
-            'testing@.com', PersonCreationRationale.UNKNOWN)
-
-    def test_invalid_name_not_accepted(self):
-        self.assertRaises(
-            InvalidName, self.person_set.createPersonAndEmail,
-            '[e-mail]', PersonCreationRationale.UNKNOWN,
-            name='/john')
-
-
->>>>>>> MERGE-SOURCE
 class TestPersonRelatedBugTaskSearch(TestCaseWithFactory):
 
     layer = DatabaseFunctionalLayer

=== modified file 'lib/lp/registry/tests/test_personset.py'
--- lib/lp/registry/tests/test_personset.py	2012-01-09 13:42:03 +0000
+++ lib/lp/registry/tests/test_personset.py	2012-01-06 15:14:48 +0000
@@ -1,8 +1,4 @@
-<<<<<<< TREE
 # Copyright 2009-2012 Canonical Ltd.  This software is licensed under the
-=======
-# Copyright 2009-2011 Canonical Ltd.  This software is licensed under the
->>>>>>> MERGE-SOURCE
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
 """Tests for PersonSet."""
@@ -22,7 +18,6 @@
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
-<<<<<<< TREE
 from lp.code.tests.helpers import remove_all_sample_data_branches
 from lp.registry.errors import (
     InvalidName,
@@ -30,9 +25,6 @@
     )
 from lp.registry.interfaces.karma import IKarmaCacheManager
 from lp.registry.interfaces.mailinglist import MailingListStatus
-=======
-from lp.code.tests.helpers import remove_all_sample_data_branches
->>>>>>> MERGE-SOURCE
 from lp.registry.interfaces.mailinglistsubscription import (
     MailingListAutoSubscribePolicy,
     )
@@ -40,7 +32,6 @@
 from lp.registry.interfaces.person import (