Merge lp:~rockstar/launchpad/pedantry-round1 into lp:launchpad

[Paul Hummer]

[Paul Hummer (rockstar)]

Hi Michael-

  This change fixes bug #429813 which I apparently filed after talking to you.
It was a bug assigned to me, and I want no more bugs assigned to me at all.
This bug removes a factory method that doesn't really test the real world
models the way they appear in production.

Cheers,
Paul

[Michael Hudson-Doyle (mwhudson)]

Woo.

review: Approve

=== modified file 'lib/lp/code/stories/branches/xx-branch-edit.txt'
--- lib/lp/code/stories/branches/xx-branch-edit.txt	2009-10-10 23:02:19 +0000
+++ lib/lp/code/stories/branches/xx-branch-edit.txt	2010-01-15 04:20:25 +0000
@@ -216,8 +216,10 @@
     >>> sample_person = getUtility(IPersonSet).getByName('name12')
     >>> foogoo = factory.makeProduct(
     ...     name='foogoo', owner=sample_person)
-    >>> foogoo_svn = factory.makeImportBranch(
-    ...     name='foogoo-svn', product=foogoo, owner=sample_person)
+    >>> foogoo_svn_import = factory.makeCodeImport(
+    ...     svn_branch_url='http://foogoo.example.com',
+    ...     branch_name='foogoo-svn', product=foogoo, registrant=sample_person)
+    >>> foogoo_svn = foogoo_svn_import.branch
     >>> _unused = foogoo_svn.subscribe(sample_person,
     ...     BranchSubscriptionNotificationLevel.ATTRIBUTEONLY,
     ...     BranchSubscriptionDiffSize.NODIFF,

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-01-13 14:16:18 +0000
+++ lib/lp/testing/factory.py	2010-01-15 04:20:25 +0000
@@ -748,13 +748,6 @@
             product = self.makeProduct()
         return self.makeBranch(product=product, **kwargs)
 
-    def makeImportBranch(self, **kwargs):
-        """Make a in import branch on an arbitrary product.
-
-        See `makeBranch` for more information on arguments.
-        """
-        return self.makeBranch(branch_type=BranchType.IMPORTED, **kwargs)
-
     def makeAnyBranch(self, **kwargs):
         """Make a branch without caring about its container.