launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Colin Watson has proposed merging lp:~cjwatson/launchpad/testfix-product-all-branches-dies into lp:launchpad.

Commit message:
Stabilise admin case of Product:+branches test in xx-private-branch-listings.txt.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/testfix-product-all-branches-dies/+merge/260814

Stabilise admin case of Product:+branches test in xx-private-branch-listings.txt.  ?field.sort_by=by+status is equivalent to the previous +all-branches test.  Also a couple of related tidy-ups.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~cjwatson/launchpad/testfix-product-all-branches-dies into lp:launchpad.

=== modified file 'lib/lp/code/browser/branchlisting.py'
--- lib/lp/code/browser/branchlisting.py	2015-06-02 06:35:38 +0000
+++ lib/lp/code/browser/branchlisting.py	2015-06-02 10:57:19 +0000
@@ -16,7 +16,6 @@
     'PersonBranchesView',
     'PersonCodeSummaryView',
     'PersonTeamBranchesView',
-    'ProductAllBranchesView',
     'ProductBranchListingView',
     'ProductBranchesMenu',
     'ProductBranchesView',

=== modified file 'lib/lp/code/stories/branches/xx-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-branch-listings.txt	2015-06-02 06:35:38 +0000
+++ lib/lp/code/stories/branches/xx-branch-listings.txt	2015-06-02 10:57:19 +0000
@@ -225,7 +225,7 @@
 
     >>> browser.open(
     ...     'http://code.launchpad.dev/firefox/+branches'
-    ...     '?field.sort_by=LIFECYCLE')
+    ...     '?field.sort_by=by+status')
     >>> branchSummary(browser)
     /~mark/firefox/release--0.9.1
     /~mark/firefox/release-0.8

=== modified file 'lib/lp/code/stories/branches/xx-private-branch-listings.txt'
--- lib/lp/code/stories/branches/xx-private-branch-listings.txt	2015-06-02 06:35:38 +0000
+++ lib/lp/code/stories/branches/xx-private-branch-listings.txt	2015-06-02 10:57:19 +0000
@@ -103,7 +103,9 @@
 listing tab.
 
     >>> def print_landscape_code_listing(browser):
-    ...     browser.open('http://code.launchpad.dev/landscape/+branches')
+    ...     browser.open(
+    ...         'http://code.launchpad.dev/landscape/+branches'
+    ...         '?field.sort_by=by+status')
     ...     table = find_tag_by_id(browser.contents, 'branchtable')
     ...     # If there are no branches, the table is not shown.
     ...     # So print the text shown in the application summary.
@@ -128,9 +130,9 @@
 
     >>> print_landscape_code_listing(admin_browser)
     A development focus ...
-    lp://dev/~no-priv/landscape/testing-branch      Development   ...
     lp://dev/~landscape-developers/landscape/trunk  Development   ...
     lp://dev/~name12/landscape/feature-x            Development   ...
+    lp://dev/~no-priv/landscape/testing-branch      Development   ...
 
 
 Person code listing pages