Merge lp:~james-w/launchpad/code-imports-use-ibranchtarget into lp:launchpad

[James Westby]

ICodeImportSet.new now takes an IBranchTarget instead of an IProduct.

Make ICodeImportSet.new act on IBranchTargets.

The code import creation only cares about a namespace, so use the more
generic interface to get one.

This changes the factory, adding makeProductCodeImport to still allow you
to pass product which will be turned in to an IBranch target as needed.

This doesn't add any new functionality, that will come later.

Most of the changes are mechanical, it's only a few places where the
behaviour may have changed.

[James Westby (james-w)]

Now passes all .*code.* tests in ec2, so ready for review.

Thanks,

James

[Tim Penhey (thumper)]

James, this all looks good.

My only comment is about the codeimport doc test.

How much work is it to change the following line:

>>> target = IBranchTarget(getUtility(IProductSet).getByName('firefox'))

to use factory.makeProduct(name='widget') ?

I'd love to move more away from sample data in the tests.

review: Approve

[James Westby (james-w)]

On Thu, 18 Mar 2010 21:06:13 -0000, Tim Penhey <email address hidden> wrote:
> Review: Approve
> James, this all looks good.
>
> My only comment is about the codeimport doc test.
>
> How much work is it to change the following line:
>
> >>> target = IBranchTarget(getUtility(IProductSet).getByName('firefox'))
>
> to use factory.makeProduct(name='widget') ?
>
> I'd love to move more away from sample data in the tests.

I'll have a look, it's rather an old doctest, so there may be some
cleanup involved.

Thanks,

James

[Tim Penhey (thumper)]

If you are going to print out the email of a person, make it explicit in the creation of the person.

So,
   factory.makePerson(displayname="Code Import Person", <email address hidden>")
instead of just:
   factory.makePerson(displayname="Code Import Person")

Thanks for updating the test.

review: Approve

[James Westby (james-w)]

Fixed, it now defines the name and email for the created person
so as not to rely on the created values.

Thanks,

James

=== modified file 'lib/canonical/launchpad/webapp/tales.py'
--- lib/canonical/launchpad/webapp/tales.py	2010-03-16 05:09:55 +0000
+++ lib/canonical/launchpad/webapp/tales.py	2010-03-20 22:14:44 +0000
@@ -1494,12 +1494,12 @@
 class CodeImportFormatterAPI(CustomizableFormatter):
     """Adapter providing fmt support for CodeImport objects"""
 
-    _link_summary_template = _('Import of %(product)s: %(branch)s')
+    _link_summary_template = _('Import of %(target)s: %(branch)s')
     _link_permission = 'zope.Public'
 
     def _link_summary_values(self):
         """See CustomizableFormatter._link_summary_values."""
-        return {'product': self._context.product.displayname,
+        return {'target': self._context.branch.target.displayname,
                 'branch': self._context.branch.bzr_identity,
                }
 

=== modified file 'lib/lp/code/browser/codeimport.py'
--- lib/lp/code/browser/codeimport.py	2010-03-20 22:14:06 +0000
+++ lib/lp/code/browser/codeimport.py	2010-03-20 22:14:44 +0000
@@ -39,6 +39,7 @@
     ICodeImport, ICodeImportSet)
 from lp.code.interfaces.codeimportmachine import ICodeImportMachineSet
 from lp.code.interfaces.branch import BranchExists, IBranch
+from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.registry.interfaces.product import IProduct
 from canonical.launchpad.webapp import (
     action, canonical_url, custom_widget, LaunchpadFormView, LaunchpadView,
@@ -333,7 +334,7 @@
         cvs_root, cvs_module, url = self._getImportLocation(data)
         return getUtility(ICodeImportSet).new(
             registrant=self.user,
-            product=product,
+            target=IBranchTarget(product),
             branch_name=data['branch_name'],
             rcs_type=data['rcs_type'],
             url=url,

=== modified file 'lib/lp/code/doc/codeimport.txt'
--- lib/lp/code/doc/codeimport.txt	2010-03-18 06:03:11 +0000
+++ lib/lp/code/doc/codeimport.txt	2010-03-20 22:14:44 +0000
@@ -21,6 +21,7 @@
 CodeImports are created and found using the ICodeImportSet interface,
 which is registered as a utility.
 
+    >>> from lp.code.interfaces.branchtarget import IBranchTarget
     >>> from lp.code.interfaces.codeimport import ICodeImport, ICodeImportSet
     >>> from canonical.launchpad.webapp.testing import verifyObject
     >>> from zope.component import getUtility
@@ -29,11 +30,12 @@
     >>> verifyObject(ICodeImportSet, removeSecurityProxy(code_import_set))
     True
 
-CodeImports record who created them, and we're going to pretend that
-this is done by 'No Privileges Person'.
+CodeImports record who created them, so we're going to create a new
+person with no special privileges.
 
-    >>> from lp.registry.interfaces.person import IPersonSet
-    >>> nopriv = getUtility(IPersonSet).getByName('no-priv')
+    >>> nopriv = factory.makePerson(
+    ...     displayname="Code Import Person", email="[e-mail]",
+    ...     name="import-person")
 
 
 CodeImport events
@@ -71,10 +73,9 @@
     >>> cvs = RevisionControlSystems.CVS
     >>> cvs_root = ':pserver:[e-mail]:/cvsroot'
     >>> cvs_module = 'hello'
-    >>> from lp.registry.interfaces.product import IProductSet
-    >>> product = getUtility(IProductSet).getByName('firefox')
+    >>> target = IBranchTarget(factory.makeProduct(name='widget'))
     >>> cvs_import = code_import_set.new(
-    ...     registrant=nopriv, product=product, branch_name='trunk-cvs',
+    ...     registrant=nopriv, target=target, branch_name='trunk-cvs',
     ...     rcs_type=cvs, cvs_root=cvs_root, cvs_module=cvs_module)
     >>> verifyObject(ICodeImport, removeSecurityProxy(cvs_import))
     True
@@ -95,12 +96,12 @@
     >>> import email
     >>> message = email.message_from_string(stub.test_emails[0][2])
     >>> print message['subject']
-    New code import: firefox/trunk-cvs
+    New code import: widget/trunk-cvs
     >>> print message['X-Launchpad-Message-Rationale']
     Operator @vcs-imports
     >>> print message.get_payload(decode=True)
-    A new CVS code import has been requested by No Privileges Person:
-        http://code.launchpad.dev/~no-priv/firefox/trunk-cvs
+    A new CVS code import has been requested by Code Import Person:
+        http://code.launchpad.dev/~import-person/widget/trunk-cvs
     from
         :pserver:[e-mail]:/cvsroot, hello
     <BLANKLINE>
@@ -131,7 +132,7 @@
     >>> svn = RevisionControlSystems.SVN
     >>> svn_url = 'svn://svn.example.com/trunk'
     >>> svn_import = code_import_set.new(
-    ...     registrant=nopriv, product=product, branch_name='trunk-svn',
+    ...     registrant=nopriv, target=target, branch_name='trunk-svn',
     ...     rcs_type=svn, url=svn_url)
     >>> verifyObject(ICodeImport, removeSecurityProxy(svn_import))
     True
@@ -160,7 +161,7 @@
     >>> bzr_svn = RevisionControlSystems.BZR_SVN
     >>> bzr_svn_url = 'svn://svn.example.com/for-bzr-svn/trunk'
     >>> bzr_svn_import = code_import_set.new(
-    ...     registrant=nopriv, product=product, branch_name='trunk-bzr-svn',
+    ...     registrant=nopriv, target=target, branch_name='trunk-bzr-svn',
     ...     rcs_type=bzr_svn, url=bzr_svn_url)
     >>> verifyObject(ICodeImport, removeSecurityProxy(svn_import))
     True
@@ -182,7 +183,7 @@
     >>> git = RevisionControlSystems.GIT
     >>> git_url = 'git://git.example.com/hello.git'
     >>> git_import = code_import_set.new(
-    ...     registrant=nopriv, product=product, branch_name='trunk-git',
+    ...     registrant=nopriv, target=target, branch_name='trunk-git',
     ...     rcs_type=git, url=git_url)
     >>> verifyObject(ICodeImport, removeSecurityProxy(git_import))
     True
@@ -209,7 +210,7 @@
     >>> hg = RevisionControlSystems.HG
     >>> hg_url = 'http://hg.example.com/metallic'
     >>> hg_import = code_import_set.new(
-    ...     registrant=nopriv, product=product, branch_name='trunk-hg',
+    ...     registrant=nopriv, target=target, branch_name='trunk-hg',
     ...     rcs_type=hg, url=hg_url)
     >>> verifyObject(ICodeImport, removeSecurityProxy(hg_import))
     True
@@ -237,7 +238,7 @@
 'updateFromData'.  updateFromData returns a MODIFY CodeImportEvent if
 any changes were made, or None if not.
 
-    >>> code_import = factory.makeCodeImport(
+    >>> code_import = factory.makeProductCodeImport(
     ...     svn_branch_url='http://svn.example.com/project')
     >>> print code_import.review_status.title
     Pending Review
@@ -268,7 +269,7 @@
     ...      'url': 'http://svn.example.com/project/trunk'},
     ...     nopriv)
     >>> print_emails(group_similar=True)
-    From: No Privileges Person <[e-mail]>
+    From: Code Import Person <[e-mail]>
     To: [e-mail], ...
     Subject: Code import product.../name... status: Reviewed
     <BLANKLINE>
@@ -286,8 +287,8 @@
     team.
     <BLANKLINE>
     ----------------------------------------
-    From: No Privileges Person <[e-mail]>
-    To: [e-mail]
+    From: Code Import Person <[e-mail]>
+    To: [e-mail]
     Subject: Code import product.../name... status: Reviewed
     <BLANKLINE>
     The import has been approved and an import will start shortly.
@@ -324,7 +325,7 @@
     Subject: Code import product.../name... status: Reviewed
     ...
     From: [e-mail]
-    To: [e-mail]
+    To: [e-mail]
     Subject: Code import product.../name... status: Reviewed
     ...
 
@@ -473,9 +474,9 @@
 only over the API.
 
     >>> print canonical_url(svn_import.branch)
-    http://code.launchpad.dev/~no-priv/firefox/trunk-svn
+    http://code.launchpad.dev/~import-person/widget/trunk-svn
     >>> print canonical_url(svn_import)
-    http://code.launchpad.dev/~no-priv/firefox/trunk-svn/+code-import
+    http://code.launchpad.dev/~import-person/widget/trunk-svn/+code-import
 
 
 Modifying CodeImports
@@ -532,7 +533,7 @@
     >>> modify_event = cvs_import.updateFromData(data, nopriv)
     >>> print make_email_body_for_code_import_update(
     ...     cvs_import, modify_event, None)
-    ~no-priv/firefox/trunk-cvs is now being imported from:
+    ~import-person/widget/trunk-cvs is now being imported from:
         hello from :pserver:[e-mail]:/var/cvsroot
     instead of:
         hello from :pserver:[e-mail]:/cvsroot
@@ -543,7 +544,7 @@
     >>> modify_event = git_import.updateFromData(data, nopriv)
     >>> print make_email_body_for_code_import_update(
     ...     git_import, modify_event, None)
-    ~no-priv/firefox/trunk-git is now being imported from:
+    ~import-person/widget/trunk-git is now being imported from:
         git://git.example.com/goodbye.git
     instead of:
         git://git.example.com/hello.git
@@ -554,7 +555,7 @@
     >>> modify_event = bzr_svn_import.updateFromData(data, nopriv)
     >>> print make_email_body_for_code_import_update(
     ...     bzr_svn_import, modify_event, None)
-    ~no-priv/firefox/trunk-bzr-svn is now being imported from:
+    ~import-person/widget/trunk-bzr-svn is now being imported from:
         http://svn.example.com/for-bzr-svn/trunk
     instead of:
         svn://svn.example.com/for-bzr-svn/trunk
@@ -565,7 +566,7 @@
     >>> modify_event = hg_import.updateFromData(data, nopriv)
     >>> print make_email_body_for_code_import_update(
     ...     hg_import, modify_event, None)
-    ~no-priv/firefox/trunk-hg is now being imported from:
+    ~import-person/widget/trunk-hg is now being imported from:
         http://metal.example.com/byebye.hg
     instead of:
         http://hg.example.com/metallic

=== modified file 'lib/lp/code/interfaces/codeimport.py'
--- lib/lp/code/interfaces/codeimport.py	2010-03-20 22:14:06 +0000
+++ lib/lp/code/interfaces/codeimport.py	2010-03-20 22:14:44 +0000
@@ -178,9 +178,12 @@
 class ICodeImportSet(Interface):
     """Interface representing the set of code imports."""
 
-    def new(registrant, product, branch_name, rcs_type, url=None,
+    def new(registrant, target, branch_name, rcs_type, url=None,
             cvs_root=None, cvs_module=None, review_status=None):
-        """Create a new CodeImport."""
+        """Create a new CodeImport.
+
+        :param target: An `IBranchTarget` that the code is associated with.
+        """
 
     def getActiveImports(text=None):
         """Return an iterable of all 'active' CodeImport objects.

=== modified file 'lib/lp/code/mail/tests/test_codeimport.py'
--- lib/lp/code/mail/tests/test_codeimport.py	2010-03-09 07:38:04 +0000
+++ lib/lp/code/mail/tests/test_codeimport.py	2010-03-20 22:14:44 +0000
@@ -25,7 +25,7 @@
         fooix = self.factory.makeProduct(name='fooix')
         # Eric needs to be logged in for the mail to be sent.
         login_person(eric)
-        code_import = self.factory.makeCodeImport(
+        code_import = self.factory.makeProductCodeImport(
             cvs_root=':pserver:[e-mail]:/cvsroot',
             cvs_module='a_module', branch_name='import',
             product=fooix, registrant=eric)
@@ -48,7 +48,7 @@
         fooix = self.factory.makeProduct(name='fooix')
         # Eric needs to be logged in for the mail to be sent.
         login_person(eric)
-        code_import = self.factory.makeCodeImport(
+        code_import = self.factory.makeProductCodeImport(
             svn_branch_url='svn://svn.example.com/fooix/trunk',
             branch_name='trunk', product=fooix, registrant=eric,
             rcs_type=RevisionControlSystems.BZR_SVN)
@@ -71,7 +71,7 @@
         fooix = self.factory.makeProduct(name='fooix')
         # Eric needs to be logged in for the mail to be sent.
         login_person(eric)
-        code_import = self.factory.makeCodeImport(
+        code_import = self.factory.makeProductCodeImport(
             git_repo_url='git://git.example.com/fooix.git',
             branch_name='master', product=fooix, registrant=eric)
         transaction.commit()
@@ -94,7 +94,7 @@
         fooix = self.factory.makeProduct(name='fooix')
         # Eric needs to be logged in for the mail to be sent.
         login_person(eric)
-        code_import = self.factory.makeCodeImport(
+        code_import = self.factory.makeProductCodeImport(
             hg_repo_url='http://hg.example.com/fooix.hg',
             branch_name='master', product=fooix, registrant=eric)
         transaction.commit()

=== modified file 'lib/lp/code/model/codeimport.py'
--- lib/lp/code/model/codeimport.py	2010-03-20 22:14:06 +0000
+++ lib/lp/code/model/codeimport.py	2010-03-20 22:14:44 +0000
@@ -205,7 +205,7 @@
 
     implements(ICodeImportSet)
 
-    def new(self, registrant, product, branch_name, rcs_type,
+    def new(self, registrant, target, branch_name, rcs_type,
             url=None, cvs_root=None, cvs_module=None, review_status=None):
         """See `ICodeImportSet`."""
         if rcs_type == RevisionControlSystems.CVS:
@@ -229,7 +229,7 @@
             else:
                 review_status = CodeImportReviewStatus.NEW
         # Create the branch for the CodeImport.
-        namespace = get_branch_namespace(registrant, product)
+        namespace = target.getNamespace(registrant)
         import_branch = namespace.createBranch(
             branch_type=BranchType.IMPORTED, name=branch_name,
             registrant=registrant)

=== modified file 'lib/lp/code/model/tests/test_branchtarget.py'
--- lib/lp/code/model/tests/test_branchtarget.py	2009-11-16 22:53:42 +0000
+++ lib/lp/code/model/tests/test_branchtarget.py	2010-03-20 22:14:44 +0000
@@ -91,7 +91,7 @@
 
     def test_adapter(self):
         target = IBranchTarget(self.original)
-        self.assertIsInstance(self.target, PackageBranchTarget)
+        self.assertIsInstance(target, PackageBranchTarget)
 
     def test_components(self):
         target = IBranchTarget(self.original)

=== modified file 'lib/lp/code/model/tests/test_codeimport.py'
--- lib/lp/code/model/tests/test_codeimport.py	2010-03-20 22:14:06 +0000
+++ lib/lp/code/model/tests/test_codeimport.py	2010-03-20 22:14:44 +0000
@@ -17,6 +17,7 @@
 from lp.code.model.codeimportevent import CodeImportEvent
 from lp.code.model.codeimportjob import CodeImportJob, CodeImportJobSet
 from lp.code.model.codeimportresult import CodeImportResult
+from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.codeimport import ICodeImportSet
 from lp.registry.interfaces.person import IPersonSet
 from lp.code.enums import (
@@ -39,7 +40,7 @@
         """A new subversion code import should have NEW status."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.SVN,
             url=self.factory.getUniqueURL())
@@ -53,7 +54,7 @@
         """A specific review status can be set for a new import."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.SVN,
             url=self.factory.getUniqueURL(),
@@ -68,7 +69,7 @@
         """A new CVS code import should have NEW status."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.CVS,
             cvs_root=self.factory.getUniqueURL(),
@@ -83,7 +84,7 @@
         """A specific review status can be set for a new import."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.CVS,
             cvs_root=self.factory.getUniqueURL(),
@@ -99,7 +100,7 @@
         """A new git import is always reviewed by default."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.GIT,
             url=self.factory.getUniqueURL(),
@@ -114,7 +115,7 @@
         """A new hg import is always reviewed by default."""
         code_import = CodeImportSet().new(
             registrant=self.factory.makePerson(),
-            product=self.factory.makeProduct(),
+            target=IBranchTarget(self.factory.makeProduct()),
             branch_name='imported',
             rcs_type=RevisionControlSystems.HG,
             url=self.factory.getUniqueURL(),
@@ -565,7 +566,7 @@
         project = None
     product = factory.makeProduct(
         name=product_name, displayname=product_name, project=project)
-    code_import = factory.makeCodeImport(
+    code_import = factory.makeProductCodeImport(
         product=product, branch_name=branch_name,
         svn_branch_url=svn_branch_url, cvs_root=cvs_root,
         cvs_module=cvs_module, git_repo_url=git_repo_url,
@@ -662,7 +663,7 @@
             self.factory, product_name='prod1', branch_name='a')
         prod2_a = make_active_import(
             self.factory, product_name='prod2', branch_name='a')
-        prod1_b = self.factory.makeCodeImport(
+        prod1_b = self.factory.makeProductCodeImport(
             product=prod1_a.branch.product, branch_name='b')
         make_import_active(self.factory, prod1_b)
         results = getUtility(ICodeImportSet).getActiveImports()

=== modified file 'lib/lp/code/stories/branches/xx-branch-edit.txt'
--- lib/lp/code/stories/branches/xx-branch-edit.txt	2010-03-09 16:58:30 +0000
+++ lib/lp/code/stories/branches/xx-branch-edit.txt	2010-03-20 22:14:44 +0000
@@ -216,7 +216,7 @@
     >>> sample_person = getUtility(IPersonSet).getByName('name12')
     >>> foogoo = factory.makeProduct(
     ...     name='foogoo', owner=sample_person)
-    >>> foogoo_svn_import = factory.makeCodeImport(
+    >>> foogoo_svn_import = factory.makeProductCodeImport(
     ...     svn_branch_url='http://foogoo.example.com',
     ...     branch_name='foogoo-svn', product=foogoo, registrant=sample_person)
     >>> foogoo_svn = foogoo_svn_import.branch

=== modified file 'lib/lp/code/stories/codeimport/xx-admin-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-01-22 03:16:44 +0000
+++ lib/lp/code/stories/codeimport/xx-admin-codeimport.txt	2010-03-20 22:14:44 +0000
@@ -10,30 +10,30 @@
     >>> from lp.testing import ANONYMOUS, login, logout
     >>> login('[e-mail]')
 
-    >>> svn_import = factory.makeCodeImport(
+    >>> svn_import = factory.makeProductCodeImport(
     ...     svn_branch_url='svn://svn.example.com/fooix/trunk')
     >>> from canonical.launchpad.webapp import canonical_url
     >>> svn_import_location = str(canonical_url(svn_import.branch))
     >>> svn_import_branch_unique_name = svn_import.branch.unique_name
 
-    >>> bzr_svn_import = factory.makeCodeImport(
+    >>> bzr_svn_import = factory.makeProductCodeImport(
     ...     svn_branch_url='svn://svn.example.com/bzr-svn/trunk',
     ...     rcs_type=RevisionControlSystems.BZR_SVN)
     >>> bzr_svn_import_location = str(canonical_url(bzr_svn_import.branch))
     >>> bzr_svn_import_branch_unique_name = bzr_svn_import.branch.unique_name
 
-    >>> cvs_import = factory.makeCodeImport(
+    >>> cvs_import = factory.makeProductCodeImport(
     ...     cvs_root=":pserver:[e-mail]:/fooix",
     ...     cvs_module="fooix")
     >>> cvs_import_location = str(canonical_url(cvs_import.branch))
     >>> cvs_import_branch_unique_name = cvs_import.branch.unique_name
 
-    >>> git_import = factory.makeCodeImport(
+    >>> git_import = factory.makeProductCodeImport(
     ...     git_repo_url="git://git.example.org/fooix")
     >>> git_import_location = str(canonical_url(git_import.branch))
     >>> git_import_branch_unique_name = git_import.branch.unique_name
 
-    >>> hg_import = factory.makeCodeImport(
+    >>> hg_import = factory.makeProductCodeImport(
     ...     hg_repo_url="http://hg.example.org/bar")
     >>> hg_import_location = str(canonical_url(hg_import.branch))
     >>> hg_import_branch_unique_name = hg_import.branch.unique_name

=== modified file 'lib/lp/code/stories/codeimport/xx-edit-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-edit-codeimport.txt	2010-03-11 20:54:36 +0000
+++ lib/lp/code/stories/codeimport/xx-edit-codeimport.txt	2010-03-20 22:14:44 +0000
@@ -12,7 +12,7 @@
 
     >>> login(ANONYMOUS)
     >>> registrant = factory.makePerson(password='test')
-    >>> svn_import = factory.makeCodeImport(
+    >>> svn_import = factory.makeProductCodeImport(
     ...     svn_branch_url='svn://svn.example.com/fooix/trunk',
     ...     registrant=registrant)
     >>> svn_import_location = str(canonical_url(svn_import.branch))

=== modified file 'lib/lp/code/stories/codeimport/xx-failing-codeimport.txt'
--- lib/lp/code/stories/codeimport/xx-failing-codeimport.txt	2009-10-06 17:44:23 +0000
+++ lib/lp/code/stories/codeimport/xx-failing-codeimport.txt	2010-03-20 22:14:44 +0000
@@ -10,7 +10,7 @@
     >>> from canonical.config import config
     >>> product = factory.makeProduct(name='imported')
     >>> owner = factory.makePerson(name='import-owner')
-    >>> code_import = factory.makeCodeImport(
+    >>> code_import = factory.makeProductCodeImport(
     ...     product=product, branch_name='trunk', registrant=owner)
     >>> for i in range(config.codeimport.consecutive_failure_limit):
     ...     dummy = make_finished_import(

=== modified file 'lib/lp/code/stories/webservice/xx-code-import.txt'
--- lib/lp/code/stories/webservice/xx-code-import.txt	2010-03-16 19:27:44 +0000
+++ lib/lp/code/stories/webservice/xx-code-import.txt	2010-03-20 22:14:44 +0000
@@ -11,7 +11,7 @@
     >>> login(ANONYMOUS)
     >>> person = factory.makePerson(name='import-owner')
     >>> product = factory.makeProduct(name='scruff')
-    >>> code_import = removeSecurityProxy(factory.makeCodeImport(
+    >>> code_import = removeSecurityProxy(factory.makeProductCodeImport(
     ...    registrant=person, product=product, branch_name='import'))
     >>> no_import_branch = removeSecurityProxy(factory.makeProductBranch(
     ...     owner=person, product=product, name='no-import'))

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-03-15 15:12:20 +0000
+++ lib/lp/testing/factory.py	2010-03-20 22:14:44 +0000
@@ -79,6 +79,7 @@
 from lp.code.errors import UnknownBranchTypeError
 from lp.code.interfaces.branchmergequeue import IBranchMergeQueueSet
 from lp.code.interfaces.branchnamespace import get_branch_namespace
+from lp.code.interfaces.branchtarget import IBranchTarget
 from lp.code.interfaces.codeimport import ICodeImportSet
 from lp.code.interfaces.codeimportevent import ICodeImportEventSet
 from lp.code.interfaces.codeimportmachine import ICodeImportMachineSet
@@ -1370,8 +1371,15 @@
         return target.newFAQ(
             owner=target.owner, title=title, content='content')
 
+    def makeProductCodeImport(self, product=None, **kwargs):
+        """Make a code import targetting a product."""
+        if product is None:
+            product = self.makeProduct()
+        target = IBranchTarget(product)
+        return self.makeCodeImport(target=target, **kwargs)
+
     def makeCodeImport(self, svn_branch_url=None, cvs_root=None,
-                       cvs_module=None, product=None, branch_name=None,
+                       cvs_module=None, target=None, branch_name=None,
                        git_repo_url=None, hg_repo_url=None, registrant=None,
                        rcs_type=None):
         """Create and return a new, arbitrary code import.
@@ -1384,8 +1392,8 @@
             hg_repo_url is None):
             svn_branch_url = self.getUniqueURL()
 
-        if product is None:
-            product = self.makeProduct()
+        if target is None:
+            target = IBranchTarget(self.makeProduct())
         if branch_name is None:
             branch_name = self.getUniqueString('name')
         if registrant is None:
@@ -1399,23 +1407,23 @@
                 assert rcs_type in (RevisionControlSystems.SVN,
                                     RevisionControlSystems.BZR_SVN)
             return code_import_set.new(
-                registrant, product, branch_name, rcs_type=rcs_type,
+                registrant, target, branch_name, rcs_type=rcs_type,
                 url=svn_branch_url)
         elif git_repo_url is not None:
             assert rcs_type in (None, RevisionControlSystems.GIT)
             return code_import_set.new(
-                registrant, product, branch_name,
+                registrant, target, branch_name,
                 rcs_type=RevisionControlSystems.GIT,
                 url=git_repo_url)
         elif hg_repo_url is not None:
             return code_import_set.new(
-                registrant, product, branch_name,
+                registrant, target, branch_name,
                 rcs_type=RevisionControlSystems.HG,
                 url=hg_repo_url)
         else:
             assert rcs_type in (None, RevisionControlSystems.CVS)
             return code_import_set.new(
-                registrant, product, branch_name,
+                registrant, target, branch_name,
                 rcs_type=RevisionControlSystems.CVS,
                 cvs_root=cvs_root, cvs_module=cvs_module)