Merge lp:~stub/launchpad/testsuite into lp:launchpad

[Stuart Bishop]

Remove commit() statements from the testsuite's factory.py, as they are no longer necessary now the authdb replication set has been collapsed back into the lpmain replication set.

This broke a number of tests that needed fixing. The fixes are mainly mechanical - adding an explicit commit() after a factory call. Some tests need multiple commits, even when not dealing with external processes such as the Librarian, as they are relying on objects being created with distinct timestamps and committing them all in the same transaction will give them identical timestamps.

[Michael Hudson-Doyle (mwhudson)]

It would be nice to know why the commit()s you're inserting are needed where its not obvious, but I can see why that would be exceedingly tedious to do. Otherwise, yay!

review: Approve

=== modified file 'lib/canonical/launchpad/mail/tests/test_incoming.py'
--- lib/canonical/launchpad/mail/tests/test_incoming.py	2009-08-05 13:59:44 +0000
+++ lib/canonical/launchpad/mail/tests/test_incoming.py	2010-04-13 02:02:49 +0000
@@ -3,6 +3,7 @@
 
 import unittest
 
+import transaction
 from zope.testing.doctest import DocTestSuite
 
 from canonical.launchpad.mail.incoming import handleMail, MailErrorUtility
@@ -22,6 +23,7 @@
         It should produce a message explaining to the user what went wrong.
         """
         person = self.factory.makePerson()
+        transaction.commit()
         email_address = person.preferredemail.email
         invalid_body = (
             '-----BEGIN PGP SIGNED MESSAGE-----\n'

=== modified file 'lib/canonical/launchpad/scripts/tests/test_garbo.py'
--- lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-04-08 08:55:10 +0000
+++ lib/canonical/launchpad/scripts/tests/test_garbo.py	2010-04-13 02:02:49 +0000
@@ -76,6 +76,7 @@
         self.runHourly()
 
     def runDaily(self, maximum_chunk_size=2, test_args=()):
+        transaction.commit()
         LaunchpadZopelessLayer.switchDbUser('garbo_daily')
         collector = DailyDatabaseGarbageCollector(test_args=list(test_args))
         collector._maximum_chunk_size = maximum_chunk_size
@@ -292,7 +293,6 @@
         # Validating an email address creates a linkage.
         person2.validateAndEnsurePreferredEmail(person2.guessedemails[0])
         self.assertEqual(rev2.revision_author.person, None)
-        transaction.commit()
 
         self.runDaily()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
@@ -301,7 +301,6 @@
         # Creating a person for an existing account creates a linkage.
         person3 = account3.createPerson(PersonCreationRationale.UNKNOWN)
         self.assertEqual(rev3.revision_author.person, None)
-        transaction.commit()
 
         self.runDaily()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
@@ -339,7 +338,6 @@
         # Validating an email address creates a linkage.
         person2.validateAndEnsurePreferredEmail(person2.guessedemails[0])
         self.assertEqual(sub2.owner, None)
-        transaction.commit()
 
         self.runDaily()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
@@ -348,7 +346,6 @@
         # Creating a person for an existing account creates a linkage.
         person3 = account3.createPerson(PersonCreationRationale.UNKNOWN)
         self.assertEqual(sub3.owner, None)
-        transaction.commit()
 
         self.runDaily()
         LaunchpadZopelessLayer.switchDbUser('testadmin')
@@ -362,7 +359,6 @@
         email = self.factory.makeEmail('[e-mail]', person)
         transaction.commit()
         mailing_list.subscribe(person, email)
-        transaction.commit()
 
         # User remains subscribed if we run the garbage collector.
         self.runDaily()
@@ -372,7 +368,6 @@
         # garbage collector removes the subscription.
         LaunchpadZopelessLayer.switchDbUser('testadmin')
         Store.of(email).remove(email)
-        transaction.commit()
         self.runDaily()
         self.assertEqual(mailing_list.getSubscription(person), None)
 
@@ -390,7 +385,6 @@
         person_old = self.factory.makePerson(name='test-unlinked-person-old')
         removeSecurityProxy(person_old).datecreated = datetime(
             2008, 01, 01, tzinfo=UTC)
-        transaction.commit()
 
         # Normally, the garbage collector will do nothing because the
         # PersonPruner is experimental
@@ -453,7 +447,6 @@
         self.assertEqual(num_new, 8)
 
         # Run the garbage collector.
-        transaction.commit()
         self.runDaily()
 
         # We should have 9 BugNotifications left.
@@ -487,8 +480,6 @@
             EmailAddress, person=person).any()
         person.accountID = -1
 
-        transaction.commit()
-
         # Run the garbage collector. We should get two ERROR reports
         # about the corrupt data.
         collector = self.runDaily()
@@ -520,7 +511,7 @@
         db_branch = self.factory.makeAnyBranch()
         db_branch.branch_format = BranchFormat.BZR_BRANCH_5
         db_branch.repository_format = RepositoryFormat.BZR_KNIT_1
-
+        Store.of(db_branch).flush()
         branch_job = BranchUpgradeJob.create(db_branch)
         branch_job.job.date_finished = THIRTY_DAYS_AGO
         job_id = branch_job.job.id
@@ -530,7 +521,6 @@
                 BranchJob,
                 BranchJob.branch == db_branch.id).count(),
                 1)
-        transaction.commit()
 
         collector = self.runDaily()
 
@@ -561,7 +551,6 @@
             repository_format=RepositoryFormat.BZR_KNIT_1)
         branch_job2 = BranchUpgradeJob.create(db_branch2)
         job_id_newer = branch_job2.job.id
-        transaction.commit()
 
         collector = self.runDaily()
 

=== modified file 'lib/lp/app/browser/tests/test_launchpadroot.py'
--- lib/lp/app/browser/tests/test_launchpadroot.py	2010-01-13 02:11:09 +0000
+++ lib/lp/app/browser/tests/test_launchpadroot.py	2010-04-13 02:02:49 +0000
@@ -36,7 +36,7 @@
     def setUpRegistryExpert(self):
         """Create a registry expert and logs in as them."""
         login_person(self.admin)
-        self.expert = self.factory.makePersonNoCommit()
+        self.expert = self.factory.makePerson()
         getUtility(ILaunchpadCelebrities).registry_experts.addMember(
             self.expert, self.admin)
         login_person(self.expert)
@@ -46,7 +46,7 @@
             "Anonymous user shouldn't have launchpad.Edit on ILaunchpadRoot")
 
     def test_regular_user_cannot_edit(self):
-        login_person(self.factory.makePersonNoCommit())
+        login_person(self.factory.makePerson())
         self.failIf(check_permission('launchpad.Edit', self.root),
             "Regular users shouldn't have launchpad.Edit on ILaunchpadRoot")
 

=== modified file 'lib/lp/archiveuploader/tests/test_ppauploadprocessor.py'
--- lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-01-07 06:29:36 +0000
+++ lib/lp/archiveuploader/tests/test_ppauploadprocessor.py	2010-04-13 02:02:49 +0000
@@ -9,12 +9,12 @@
 
 __metaclass__ = type
 
+from email import message_from_string
 import os
 import shutil
 import unittest
 
-from email import message_from_string
-
+import transaction
 from zope.component import getUtility
 from zope.security.proxy import removeSecurityProxy
 
@@ -488,6 +488,7 @@
         email = "[e-mail]"
         name = "Team"
         team = self.factory.makeTeam(email=email, displayname=name)
+        transaction.commit()
         name12 = getUtility(IPersonSet).getByName("name12")
         cprov.archive.newComponentUploader(name12, "main")
         cprov.archive.newComponentUploader(team, "main")

=== modified file 'lib/lp/bugs/doc/bug-heat.txt'
--- lib/lp/bugs/doc/bug-heat.txt	2010-03-05 10:06:40 +0000
+++ lib/lp/bugs/doc/bug-heat.txt	2010-04-13 02:02:49 +0000
@@ -180,6 +180,7 @@
 target.
 
     >>> another_product = factory.makeProduct()
+    >>> transaction.commit()
     >>> bug.bugtasks[0].transitionToTarget(another_product)
     >>> print another_product.max_bug_heat
     123

=== modified file 'lib/lp/bugs/doc/bugtask-search.txt'
--- lib/lp/bugs/doc/bugtask-search.txt	2010-02-27 20:20:03 +0000
+++ lib/lp/bugs/doc/bugtask-search.txt	2010-04-13 02:02:49 +0000
@@ -709,7 +709,7 @@
     >>> import pytz
     >>> from datetime import datetime, timedelta
     >>> from canonical.launchpad.searchbuilder import greater_than
-    >>> product = factory.makeProductNoCommit()
+    >>> product = factory.makeProduct()
     >>> utc_now = datetime(2008, 9, 4, 12, 0, 0, tzinfo=pytz.timezone('UTC'))
     >>> not_closed_bug = factory.makeBug(product=product, title="Not closed")
     >>> bug_closed_a_day_ago = factory.makeBug(
@@ -739,7 +739,7 @@
     >>> from canonical.launchpad.interfaces import (
     ...     BugAttachmentType, IBugAttachmentSet, ILibraryFileAliasSet,
     ...     IMessageSet)
-    >>> product = factory.makeProductNoCommit()
+    >>> product = factory.makeProduct()
     >>> patch_bug = factory.makeBug(
     ...     product=product)
     >>> filecontent = 'Some diff data'
@@ -1120,6 +1120,7 @@
 
     >>> patch_attachment_bug_2 = factory.makeBugAttachment(
     ...     bug=bug_two, is_patch=True)
+    >>> transaction.commit()
     >>> patch_attachment_bug_10 = factory.makeBugAttachment(
     ...     bug=bug_ten, is_patch=True)
     >>> params = BugTaskSearchParams(

=== modified file 'lib/lp/bugs/stories/patches-view/patches-view.txt'
--- lib/lp/bugs/stories/patches-view/patches-view.txt	2010-03-15 03:30:09 +0000
+++ lib/lp/bugs/stories/patches-view/patches-view.txt	2010-04-13 02:02:49 +0000
@@ -10,6 +10,7 @@
     >>> patchy_product = factory.doAsUser(
     ...     '[e-mail]', factory.makeProduct,
     ...     name='patchy-product-1', displayname="Patchy 1")
+    >>> transaction.commit()
 
 We don't see any patches when we open the patches view.
 
@@ -34,15 +35,18 @@
     ...     title, product, importance=BugTaskImportance.UNDECIDED,
     ...     status=BugTaskStatus.NEW):
     ...     bug = factory.makeBug(title=title, product=product)
+    ...     transaction.commit()
     ...     bug.default_bugtask.transitionToImportance(
     ...         importance, product.owner)
     ...     bug.default_bugtask.transitionToStatus(
     ...         status, product.owner)
+    ...     transaction.commit()
     ...     return bug
 
     >>> bug_a = factory.doAsUser(
     ...     '[e-mail]', make_bug,
     ...     title="bug_a title", product=patchy_product)
+    >>> transaction.commit()
     >>> anon_browser.open(
     ...     'http://bugs.launchpad.dev/patchy-product-1/+patches')
     >>> show_patches_view(anon_browser.contents)
@@ -54,6 +58,7 @@
     >>> factory.doAsUser('[e-mail]', factory.makeBugAttachment,
     ...            bug=bug_a, is_patch=False)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> anon_browser.open('http://bugs.launchpad.dev/patchy-product-1/+patches')
     >>> show_patches_view(anon_browser.contents)
     There are no patches associated with Patchy 1 at this time.
@@ -64,12 +69,14 @@
     >>> patch_submitter = factory.doAsUser(
     ...    '[e-mail]', factory.makePerson,
     ...    name="patchy-person", displayname="Patchy Person")
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch a",
     ...     filename="patch_a.diff", owner=patch_submitter,
     ...     description="description of patch a", bug=bug_a, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> anon_browser.open(
     ...     'http://bugs.launchpad.dev/patchy-product-1/+patches')
     >>> show_patches_view(anon_browser.contents)
@@ -109,41 +116,48 @@
     ...     filename="patch_b.diff", owner=patch_submitter,
     ...     description="description of patch b", bug=bug_b, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch c",
     ...     filename="patch_c.diff", owner=patch_submitter,
     ...     description="description of patch c", bug=bug_b, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...    '[e-mail]', factory.makeBugAttachment,
     ...    bug=bug_c, is_patch=False)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch d",
     ...     filename="patch_d.diff", owner=patch_submitter,
     ...     description="description of patch d", bug=bug_c, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch e",
     ...     filename="patch_e.diff", owner=patch_submitter,
     ...     description="description of patch e", bug=bug_c, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch f",
     ...     filename="patch_f.diff", owner=patch_submitter,
     ...     description="description of patch f", bug=bug_c, is_patch=True)
     <BugAttachment at...
+    >>> transaction.commit()
     >>> factory.doAsUser(
     ...     '[e-mail]', factory.makeBugAttachment,
     ...     comment="comment about patch g",
     ...     filename="patch_g.diff", owner=patch_submitter,
     ...     description="description of patch g", bug=bug_d, is_patch=True)
     <BugAttachment at...
-
+    >>> transaction.commit()
+    
 ...the youngest patch on each bug is visible in the patch report
 (except for bugs in "Fix Released" state, which aren't shown):
 

=== modified file 'lib/lp/bugs/tests/test_apportjob.py'
--- lib/lp/bugs/tests/test_apportjob.py	2010-02-26 11:48:40 +0000
+++ lib/lp/bugs/tests/test_apportjob.py	2010-04-13 02:02:49 +0000
@@ -85,6 +85,7 @@
         blob_data = blob_file.read()
 
         self.blob = self.factory.makeBlob(blob_data)
+        transaction.commit() # We need the blob available from the Librarian.
 
     def _assertFileBugDataMatchesDict(self, filebug_data, data_dict):
         """Asser that the data in a FileBugData object matches a dict."""

=== modified file 'lib/lp/bugs/tests/test_bugs_webservice.py'
--- lib/lp/bugs/tests/test_bugs_webservice.py	2010-03-10 11:32:30 +0000
+++ lib/lp/bugs/tests/test_bugs_webservice.py	2010-04-13 02:02:49 +0000
@@ -192,7 +192,7 @@
         try:
             login('[e-mail]')
             for count in range(snapshot.HARD_LIMIT_FOR_SNAPSHOT + 1):
-                person = self.factory.makePersonNoCommit()
+                person = self.factory.makePerson()
                 bug.subscribe(person, person)
             logout()
             response = webservice.named_post(

=== modified file 'lib/lp/bugs/tests/test_bugwatch.py'
--- lib/lp/bugs/tests/test_bugwatch.py	2010-04-09 20:09:19 +0000
+++ lib/lp/bugs/tests/test_bugwatch.py	2010-04-13 02:02:49 +0000
@@ -339,7 +339,7 @@
         # The bugtasks_to_update property should yield the linked bug
         # tasks which are not conjoined and for which the bug is not a
         # duplicate.
-        product = self.factory.makeProductNoCommit()
+        product = self.factory.makeProduct()
         bug = self.factory.makeBug(product=product, owner=product.owner)
         product_task = bug.getBugTask(product)
         watch = self.factory.makeBugWatch(bug=bug)

=== modified file 'lib/lp/code/browser/tests/test_sourcepackagerecipe.py'
--- lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-03-30 04:56:42 +0000
+++ lib/lp/code/browser/tests/test_sourcepackagerecipe.py	2010-04-13 02:02:49 +0000
@@ -26,7 +26,7 @@
     layer = DatabaseFunctionalLayer
 
     def makeRecipe(self):
-        chef = self.factory.makePersonNoCommit(displayname='Master Chef',
+        chef = self.factory.makePerson(displayname='Master Chef',
                 name='chef')
         chocolate = self.factory.makeProduct(name='chocolate')
         cake_branch = self.factory.makeProductBranch(

=== modified file 'lib/lp/code/stories/branches/xx-source-package-branches-listing.txt'
--- lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2009-09-17 03:44:41 +0000
+++ lib/lp/code/stories/branches/xx-source-package-branches-listing.txt	2010-04-13 02:02:49 +0000
@@ -18,9 +18,11 @@
     >>> branch1 = factory.makePackageBranch(
     ...     sourcepackage=source_package,
     ...     owner=factory.makePerson(name='owner1'), name='branch1')
+    >>> transaction.commit()
     >>> branch2 = factory.makePackageBranch(
     ...     sourcepackage=source_package,
     ...     owner=factory.makePerson(name='owner2'), name='branch2')
+    >>> transaction.commit()
     >>> source_package_url = canonical_url(source_package, rootsite='code')
     >>> logout()
 
@@ -56,6 +58,7 @@
     ...     sourcepackage=source_package, owner=branch1.owner, name="branch3")
     >>> distro_source_package = factory.makeDistributionSourcePackage(
     ...     distribution=distro, sourcepackagename=branch1.sourcepackagename)
+    >>> transaction.commit()
     >>> distro_source_package_listing = canonical_url(
     ...     distro_source_package, view_name="+branches")
     >>> logout()

=== modified file 'lib/lp/code/stories/webservice/xx-branchmergeproposal.txt'
--- lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2010-03-10 23:40:02 +0000
+++ lib/lp/code/stories/webservice/xx-branchmergeproposal.txt	2010-04-13 02:02:49 +0000
@@ -125,6 +125,7 @@
     ...     subject='Not really', body='This is mediocre work.',
     ...     vote=CodeReviewVote.ABSTAIN, parent=comment,
     ...     merge_proposal=fixit_proposal)
+    >>> transaction.commit()
 
     >>> proposal_url = fix_url(canonical_url(
     ...     fixit_proposal, request=request, rootsite='api'))

=== modified file 'lib/lp/registry/browser/tests/peoplemerge-views.txt'
--- lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-01-19 23:57:36 +0000
+++ lib/lp/registry/browser/tests/peoplemerge-views.txt	2010-04-13 02:02:49 +0000
@@ -47,6 +47,7 @@
     >>> parent_team = factory.makeTeam()
     >>> child_team = factory.makeTeam(name='child-team')
     >>> random_team = factory.makeTeam()
+    >>> transaction.commit()
     >>> login('[e-mail]')
     >>> ignored = parent_team.addMember(
     ...     child_team, reviewer=parent_team.teamowner, force_team_add=True)
@@ -211,6 +212,7 @@
 the team that the merge operation is performed with.
 
     >>> deletable_team = factory.makeTeam(owner=team_owner, name='deletable')
+    >>> transaction.commit()
     >>> form = {
     ...     'field.target_person': 'rosetta-admins',
     ...     'field.dupe_person': 'landscape-developers',

=== modified file 'lib/lp/registry/browser/tests/product-views.txt'
--- lib/lp/registry/browser/tests/product-views.txt	2010-03-06 12:16:29 +0000
+++ lib/lp/registry/browser/tests/product-views.txt	2010-04-13 02:02:49 +0000
@@ -488,6 +488,7 @@
 the user to make the connection.
 
     >>> product = factory.makeProduct(name="bingo")
+    >>> transaction.commit()
     >>> login_person(product.owner)
     >>> view = create_initialized_view(
     ...     product, name="+portlet-packages",

=== modified file 'lib/lp/registry/browser/tests/test_person_view.py'
--- lib/lp/registry/browser/tests/test_person_view.py	2009-10-30 14:05:09 +0000
+++ lib/lp/registry/browser/tests/test_person_view.py	2010-04-13 02:02:49 +0000
@@ -5,6 +5,7 @@
 
 import unittest
 
+import transaction
 from zope.component import getUtility
 
 from canonical.launchpad.ftests import ANONYMOUS, login
@@ -25,6 +26,7 @@
         TestCaseWithFactory.setUp(self)
         person = self.factory.makePerson()
         product = self.factory.makeProduct()
+        transaction.commit()
         self.view = PersonView(
             person, LaunchpadTestRequest())
         self._makeKarmaCache(
@@ -66,7 +68,7 @@
 
         # We must commit here so that the change is seen in other transactions
         # (e.g. when the callsite issues a switchDbUser() after we return).
-        LaunchpadZopelessLayer.commit()
+        transaction.commit()
         return karmacache
 
 

=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-03-01 22:56:38 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-04-13 02:02:49 +0000
@@ -487,6 +487,7 @@
     ...     package = factory.makeSourcePackage(sourcepackagename=spn,
     ...                                         distroseries=distroseries)
     ...     package.setPackaging(productseries, product.owner)
+    ...     transaction.commit()
 
 
     >>> pkgs = distroseries.getMostRecentlyLinkedPackagings()

=== modified file 'lib/lp/registry/doc/mailinglist-subscriptions.txt'
--- lib/lp/registry/doc/mailinglist-subscriptions.txt	2009-12-24 01:41:54 +0000
+++ lib/lp/registry/doc/mailinglist-subscriptions.txt	2010-04-13 02:02:49 +0000
@@ -1077,6 +1077,7 @@
     >>> team_names.append(team_seven.name)
 
     >>> sam = factory.makePersonByName('Samuel')
+    >>> transaction.commit()
 
     >>> list_seven.subscribe(sam)
     >>> sorted(email.email for email in list_seven.getSubscribedAddresses())

=== modified file 'lib/lp/registry/doc/private-team-roles.txt'
--- lib/lp/registry/doc/private-team-roles.txt	2010-02-11 19:17:52 +0000
+++ lib/lp/registry/doc/private-team-roles.txt	2010-04-13 02:02:49 +0000
@@ -230,6 +230,7 @@
     >>> subscription = private_archive.newSubscription(
     ...     subscriber=another_priv_team,
     ...     registrant=team_owner)
+    >>> transaction.commit()
 
 Private Membership Teams cannot subscribe to private PPAs.
 
@@ -240,7 +241,6 @@
     PrivatePersonLinkageError: Cannot link person
     (name=private-membership-team, visibility=PRIVATE_MEMBERSHIP) to
     <...ArchiveSubscriber object at...
-    >>> import transaction
     >>> transaction.abort()
 
 

=== modified file 'lib/lp/testing/factory.py'
--- lib/lp/testing/factory.py	2010-04-09 02:08:39 +0000
+++ lib/lp/testing/factory.py	2010-04-13 02:02:49 +0000
@@ -307,7 +307,6 @@
         login(user)
         try:
             result = factory_method(**factory_args)
-            transaction.commit()
         finally:
             logout()
         return result
@@ -328,13 +327,8 @@
 
     def makeAccount(self, displayname, email=None, password=None,
                     status=AccountStatus.ACTIVE,
-                    rationale=AccountCreationRationale.UNKNOWN,
-                    commit=True):
-        """Create and return a new Account.
-
-        If commit is True, we do a transaction.commit() at the end so that the
-        newly created objects can be seen in other stores as well.
-        """
+                    rationale=AccountCreationRationale.UNKNOWN):
+        """Create and return a new Account."""
         account = getUtility(IAccountSet).new(
             rationale, displayname, password=password)
         removeSecurityProxy(account).status = status
@@ -345,24 +339,8 @@
             email_status = EmailAddressStatus.NEW
         email = self.makeEmail(
             email, person=None, account=account, email_status=email_status)
-        if commit:
-            transaction.commit()
         return account
 
-    def makePerson(self, *args, **kwargs):
-        """As makePersonNoCommit, except with an implicit transaction commit.
-
-        makePersonNoCommit makes changes to two seperate database connections,
-        and the returned Person can have odd behavior until a commit is
-        made. For example, person.preferredemail will be None as this
-        is looking in the main Store for email address details, not the
-        email address master Store (the auth Store).
-        """
-        person = self.makePersonNoCommit(*args, **kwargs)
-        transaction.commit()
-        self._stuff_preferredemail_cache(person)
-        return person
-
     def makeGPGKey(self, owner):
         """Give 'owner' a crappy GPG key for the purposes of testing."""
         key_id = self.getUniqueHexString(digits=8).upper()
@@ -376,20 +354,7 @@
             active=True,
             can_encrypt=False)
 
-    def _stuff_preferredemail_cache(self, person):
-        """Stuff the preferredemail cache.
-
-        cachedproperty does not get reset across transactions,
-        so person.preferredemail can contain a bogus value even after
-        a commit, despite all changes now being available in the main
-        store.
-        """
-        naked_person = removeSecurityProxy(person)
-        naked_person._preferredemail_cached = Store.of(person).find(
-            EmailAddress, personID=person.id,
-            status=EmailAddressStatus.PREFERRED).one()
-
-    def makePersonNoCommit(
+    def makePerson(
         self, email=None, name=None, password=None,
         email_address_status=None, hide_email_addresses=False,
         displayname=None, time_zone=None, latitude=None, longitude=None):
@@ -501,8 +466,6 @@
         getUtility(IEmailAddressSet).new(
             alternative_address, person, EmailAddressStatus.VALIDATED,
             account)
-        transaction.commit()
-        self._stuff_preferredemail_cache(person)
         return person
 
     def makeEmail(self, address, person, account=None, email_status=None):
@@ -568,8 +531,6 @@
         if email is not None:
             team.setContactAddress(
                 getUtility(IEmailAddressSet).new(email, team))
-        transaction.commit()
-        self._stuff_preferredemail_cache(team)
         return team
 
     def makePoll(self, team, name, title, proposition):
@@ -680,24 +641,14 @@
             signature_content=signature_content,
             description=description)
 
-    def makeProduct(self, *args, **kwargs):
-        """As makeProductNoCommit with an explicit transaction commit.
-
-        This ensures that generated owners and registrants are fully
-        flushed and available from all Stores.
-        """
-        product = self.makeProductNoCommit(*args, **kwargs)
-        transaction.commit()
-        return product
-
-    def makeProductNoCommit(
+    def makeProduct(
         self, name=None, project=None, displayname=None,
         licenses=None, owner=None, registrant=None,
         title=None, summary=None, official_malone=None,
         official_rosetta=None):
         """Create and return a new, arbitrary Product."""
         if owner is None:
-            owner = self.makePersonNoCommit()
+            owner = self.makePerson()
         if name is None:
             name = self.getUniqueString('product-name')
         if displayname is None:
@@ -1128,9 +1079,9 @@
             to this URL.
         """
         if product is None:
-            product = self.makeProductNoCommit()
+            product = self.makeProduct()
         if owner is None:
-            owner = self.makePersonNoCommit()
+            owner = self.makePerson()
         if title is None:
             title = self.getUniqueString()
         if comment is None:
@@ -1529,10 +1480,6 @@
                               merge_proposal=None):
         if sender is None:
             sender = self.makePerson()
-            # Until we commit, sender.preferredemail returns None
-            # because the email address changes pending in the auth Store
-            # are not available via the main Store.
-            transaction.commit()
         if subject is None:
             subject = self.getUniqueString('subject')
         if body is None:
@@ -2441,6 +2388,5 @@
         if blob is None:
             blob = self.getUniqueString()
         new_uuid = getUtility(ITemporaryStorageManager).new(blob, expires)
-        transaction.commit()
 
         return getUtility(ITemporaryStorageManager).fetch(new_uuid)

=== modified file 'lib/lp/translations/doc/poexportqueue-replication-lag.txt'
--- lib/lp/translations/doc/poexportqueue-replication-lag.txt	2010-03-05 17:35:45 +0000
+++ lib/lp/translations/doc/poexportqueue-replication-lag.txt	2010-04-13 02:02:49 +0000
@@ -21,7 +21,7 @@
 
 We have somebody making an export request.
 
-    >>> requester = factory.makePersonNoCommit(
+    >>> requester = factory.makePerson(
     ...     email='[e-mail]', name='punter')
 
     >>> template1 = factory.makePOTemplate()

=== modified file 'lib/lp/translations/tests/test_potmsgset.py'
--- lib/lp/translations/tests/test_potmsgset.py	2010-03-06 06:21:04 +0000
+++ lib/lp/translations/tests/test_potmsgset.py	2010-04-13 02:02:49 +0000
@@ -833,19 +833,24 @@
     def test_dismiss_empty_translation(self):
         # Set order of creation and review.
         self._setDateCreated(self.suggestion1)
+        transaction.commit()
         self._setDateCreated(self.suggestion2)
+        transaction.commit()
         # Make the translation a suggestion, too.
         suggestion3 = self.translation
         suggestion3.is_current = False
         self._setDateCreated(suggestion3)
+        transaction.commit()
         # All suggestions are visible.
         self.assertContentEqual(
             [self.suggestion1, self.suggestion2, suggestion3],
             self.potmsgset.getLocalTranslationMessages(
                 self.potemplate, self.pofile.language))
+        transaction.commit()
         # Dismiss suggestions, leaving the translation empty.
         self.potmsgset.dismissAllSuggestions(
             self.pofile, self.factory.makePerson(), self.now())
+        transaction.commit()
         current = self.potmsgset.getCurrentTranslationMessage(
             self.potemplate, self.pofile.language)
         self.assertNotEqual(None, current)

=== modified file 'lib/lp/translations/tests/test_suggestions.py'
--- lib/lp/translations/tests/test_suggestions.py	2010-03-06 06:21:04 +0000
+++ lib/lp/translations/tests/test_suggestions.py	2010-04-13 02:02:49 +0000
@@ -159,6 +159,9 @@
         oof_potmsgset = self.factory.makePOTMsgSet(
             oof_template, singular=text)
         oof_potmsgset.setSequence(oof_template, 1)
+        from storm.store import Store
+        Store.of(oof_template).flush()
+        transaction.commit()
         suggestions = oof_potmsgset.getExternallyUsedTranslationMessages(
             self.nl)
         self.assertEquals(len(suggestions), 1)

=== modified file 'lib/lp/translations/tests/test_translations_to_review.py'
--- lib/lp/translations/tests/test_translations_to_review.py	2009-11-13 12:39:11 +0000
+++ lib/lp/translations/tests/test_translations_to_review.py	2010-04-13 02:02:49 +0000
@@ -9,6 +9,7 @@
 from pytz import timezone
 from unittest import TestLoader
 
+import transaction
 from zope.security.proxy import removeSecurityProxy
 
 from lp.translations.interfaces.translationsperson import ITranslationsPerson
@@ -62,6 +63,7 @@
             self.distribution.translation_focus = self.distroseries
             self.sourcepackagename = self.factory.makeSourcePackageName()
             self.supercontext = self.distribution
+        transaction.commit()
 
         self.supercontext.translationgroup = self.translationgroup
         self.supercontext.official_rosetta = True