Merge lp:~wgrant/launchpad/disable-gitrepository-mps into lp:launchpad

Proposed by William Grant
Status: Merged
Merged at revision: 18767
Proposed branch: lp:~wgrant/launchpad/disable-gitrepository-mps
Merge into: lp:launchpad
Diff against target: 58 lines (+13/-10)
2 files modified
lib/lp/code/browser/tests/test_gitrepository.py (+12/-9)
lib/lp/code/templates/gitrepository-index.pt (+1/-1)
To merge this branch: bzr merge lp:~wgrant/launchpad/disable-gitrepository-mps
Reviewer Review Type Date Requested Status
William Grant code Approve
Review via email: mp+354091@code.launchpad.net

Commit message

Put GitRepository:+index's MP listing behind a feature flag; it's slow.

To post a comment you must log in.
Revision history for this message
William Grant (wgrant) :
review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'lib/lp/code/browser/tests/test_gitrepository.py'
--- lib/lp/code/browser/tests/test_gitrepository.py 2018-08-29 17:11:57 +0000
+++ lib/lp/code/browser/tests/test_gitrepository.py 2018-08-31 07:06:39 +0000
@@ -38,6 +38,7 @@
38from lp.registry.interfaces.person import PersonVisibility38from lp.registry.interfaces.person import PersonVisibility
39from lp.services.beautifulsoup import BeautifulSoup39from lp.services.beautifulsoup import BeautifulSoup
40from lp.services.database.constants import UTC_NOW40from lp.services.database.constants import UTC_NOW
41from lp.services.features.testing import FeatureFixture
41from lp.services.webapp.publisher import canonical_url42from lp.services.webapp.publisher import canonical_url
42from lp.services.webapp.servers import LaunchpadTestRequest43from lp.services.webapp.servers import LaunchpadTestRequest
43from lp.testing import (44from lp.testing import (
@@ -260,10 +261,11 @@
260 self.factory.makeBranchMergeProposalForGit(261 self.factory.makeBranchMergeProposalForGit(
261 target_ref=git_refs[0],262 target_ref=git_refs[0],
262 set_state=BranchMergeProposalStatus.NEEDS_REVIEW)263 set_state=BranchMergeProposalStatus.NEEDS_REVIEW)
263 with person_logged_in(repository.owner):264 with FeatureFixture({"code.git.show_repository_mps": "on"}):
264 browser = self.getViewBrowser(repository)265 with person_logged_in(repository.owner):
265 self.assertIsNotNone(266 browser = self.getViewBrowser(repository)
266 find_tag_by_id(browser.contents, 'landing-candidates'))267 self.assertIsNotNone(
268 find_tag_by_id(browser.contents, 'landing-candidates'))
267269
268 def test_landing_candidate_count(self):270 def test_landing_candidate_count(self):
269 source_repository = self.factory.makeGitRepository()271 source_repository = self.factory.makeGitRepository()
@@ -287,11 +289,12 @@
287 target_ref=target_git_refs[0],289 target_ref=target_git_refs[0],
288 source_ref=source_git_refs[0],290 source_ref=source_git_refs[0],
289 set_state=BranchMergeProposalStatus.NEEDS_REVIEW)291 set_state=BranchMergeProposalStatus.NEEDS_REVIEW)
290 with person_logged_in(target_repository.owner):292 with FeatureFixture({"code.git.show_repository_mps": "on"}):
291 browser = self.getViewBrowser(293 with person_logged_in(target_repository.owner):
292 source_repository, user=source_repository.owner)294 browser = self.getViewBrowser(
293 self.assertIsNotNone(295 source_repository, user=source_repository.owner)
294 find_tag_by_id(browser.contents, 'landing-targets'))296 self.assertIsNotNone(
297 find_tag_by_id(browser.contents, 'landing-targets'))
295298
296299
297class TestGitRepositoryViewPrivateArtifacts(BrowserTestCase):300class TestGitRepositoryViewPrivateArtifacts(BrowserTestCase):
298301
=== modified file 'lib/lp/code/templates/gitrepository-index.pt'
--- lib/lp/code/templates/gitrepository-index.pt 2018-08-29 15:38:17 +0000
+++ lib/lp/code/templates/gitrepository-index.pt 2018-08-31 07:06:39 +0000
@@ -44,7 +44,7 @@
44 </div>44 </div>
45 </div>45 </div>
4646
47 <div class="yui-g first">47 <div class="yui-g first" tal:condition="request/features/code.git.show_repository_mps">
48 <div id="repository-relations" class="portlet">48 <div id="repository-relations" class="portlet">
49 <tal:repository-pending-merges49 <tal:repository-pending-merges
50 replace="structure context/@@++repository-pending-merges" />50 replace="structure context/@@++repository-pending-merges" />