Merge lp:~twom/launchpad/precache-gitrepository-branch-queries into lp:launchpad

[Tom Wardill]

Fix tests broken by the change to a cachedproperty

BranchMergeProposal.votes changed to a cachedproperty, this changes tests to clear that cache once the BMP is loaded and altered.

[Colin Watson (cjwatson)]

I agree with your comment on IRC that it seems like you have too many calls to `clear_property_cache`, and I think that's because you're doing this slightly too far up the call stack. Try instead doing this in `make_merge_proposal_without_reviewers`, though in a more targeted form: `del get_property_cache(proposal).votes` after removing the votes. Then try removing all your `clear_property_cache` calls and see which ones you really need after that.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'lib/lp/code/browser/tests/test_branch.py'
--- lib/lp/code/browser/tests/test_branch.py	2018-06-22 10:01:34 +0000
+++ lib/lp/code/browser/tests/test_branch.py	2018-09-07 13:47:31 +0000
@@ -568,7 +568,7 @@
         view = create_view(branch, '+index')
         with StormStatementRecorder() as recorder:
             view.landing_candidates
-        self.assertThat(recorder, HasQueryCount(Equals(13)))
+        self.assertThat(recorder, HasQueryCount(Equals(14)))
 
     def test_query_count_landing_targets(self):
         product = self.factory.makeProduct()
@@ -586,7 +586,7 @@
         view = create_view(branch, '+index')
         with StormStatementRecorder() as recorder:
             view.landing_targets
-        self.assertThat(recorder, HasQueryCount(Equals(12)))
+        self.assertThat(recorder, HasQueryCount(Equals(13)))
 
     def test_query_count_subscriber_content(self):
         branch = self.factory.makeBranch()

=== modified file 'lib/lp/code/browser/tests/test_gitref.py'
--- lib/lp/code/browser/tests/test_gitref.py	2018-08-24 16:52:27 +0000
+++ lib/lp/code/browser/tests/test_gitref.py	2018-09-07 13:47:31 +0000
@@ -295,7 +295,7 @@
         view = create_view(ref, '+index')
         with StormStatementRecorder() as recorder:
             view.landing_candidates
-        self.assertThat(recorder, HasQueryCount(Equals(11)))
+        self.assertThat(recorder, HasQueryCount(Equals(12)))
 
     def test_query_count_landing_targets(self):
         project = self.factory.makeProduct()
@@ -311,4 +311,4 @@
         view = create_view(ref, '+index')
         with StormStatementRecorder() as recorder:
             view.landing_targets
-        self.assertThat(recorder, HasQueryCount(Equals(11)))
+        self.assertThat(recorder, HasQueryCount(Equals(12)))

=== modified file 'lib/lp/code/tests/helpers.py'
--- lib/lp/code/tests/helpers.py	2018-05-17 14:10:29 +0000
+++ lib/lp/code/tests/helpers.py	2018-09-07 13:47:31 +0000
@@ -49,6 +49,7 @@
 from lp.registry.interfaces.pocket import PackagePublishingPocket
 from lp.registry.interfaces.series import SeriesStatus
 from lp.services.database.sqlbase import cursor
+from lp.services.propertycache import get_property_cache
 from lp.services.memcache.testing import MemcacheFixture
 from lp.testing import (
     run_with_login,
@@ -275,6 +276,7 @@
     proposal = factory.makeBranchMergeProposal(**kwargs)
     for vote in proposal.votes:
         removeSecurityProxy(vote).destroySelf()
+    del get_property_cache(proposal).votes
     return proposal