Launchpad itself

Merge lp://qastaging/~sinzui/launchpad/tea-and-biscuts into lp://qastaging/launchpad

  1. tea-and-biscuts
  2. Merge into devel
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 12629
Proposed branch: lp://qastaging/~sinzui/launchpad/tea-and-biscuts
Merge into: lp://qastaging/launchpad
Diff against target: 1008 lines (+180/-101)
36 files modified
lib/canonical/launchpad/icing/style-3-0.css.in (+3/-0)
lib/canonical/launchpad/pagetests/feeds/xx-links.txt (+1/-1)
lib/lp/answers/doc/notifications.txt (+3/-3)
lib/lp/answers/doc/question.txt (+1/-1)
lib/lp/answers/doc/questionsets.txt (+6/-6)
lib/lp/answers/stories/distribution-package-answer-contact.txt (+6/-6)
lib/lp/answers/stories/question-browse-and-search.txt (+5/-5)
lib/lp/bugs/browser/tests/bug-nomination-views.txt (+2/-2)
lib/lp/bugs/browser/tests/person-bug-views.txt (+2/-2)
lib/lp/bugs/browser/tests/test_buglisting.py (+1/-1)
lib/lp/bugs/doc/bug-reported-acknowledgement.txt (+1/-1)
lib/lp/bugs/doc/bug-reporting-guidelines.txt (+1/-1)
lib/lp/bugs/doc/bug-set-status.txt (+4/-4)
lib/lp/bugs/doc/bug.txt (+2/-2)
lib/lp/bugs/doc/bugnotification-sending.txt (+11/-11)
lib/lp/bugs/doc/bugnotificationrecipients.txt (+8/-8)
lib/lp/bugs/doc/bugsubscription.txt (+1/-1)
lib/lp/bugs/doc/initial-bug-contacts.txt (+2/-2)
lib/lp/bugs/stories/bugs/xx-bug-contacts-reports.txt (+4/-4)
lib/lp/bugs/stories/bugs/xx-front-page-info.txt (+1/-1)
lib/lp/bugs/stories/feeds/xx-bug-atom.txt (+1/-1)
lib/lp/bugs/stories/structural-subscriptions/xx-bug-subscriptions.txt (+8/-8)
lib/lp/registry/browser/distributionsourcepackage.py (+15/-0)
lib/lp/registry/browser/tests/test_distributionsourcepackage.py (+53/-1)
lib/lp/registry/doc/distribution-sourcepackage.txt (+1/-2)
lib/lp/registry/doc/sourcepackage.txt (+1/-1)
lib/lp/registry/model/distributionsourcepackage.py (+1/-1)
lib/lp/registry/stories/person/xx-person-subscriptions.txt (+8/-8)
lib/lp/registry/stories/product/xx-product-index.txt (+1/-1)
lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt (+6/-1)
lib/lp/registry/stories/webservice/xx-distribution-source-package.txt (+1/-1)
lib/lp/registry/templates/distributionsourcepackage-index.pt (+11/-10)
lib/lp/registry/templates/productseries-index.pt (+4/-0)
lib/lp/soyuz/doc/distroarchseriesbinarypackage.txt (+1/-1)
lib/lp/soyuz/doc/sourcepackagerelease.txt (+1/-1)
lib/lp/translations/stories/standalone/custom-language-codes.txt (+2/-2)
To merge this branch: bzr merge lp://qastaging/~sinzui/launchpad/tea-and-biscuts
Reviewer Review Type Date Requested Status
Brad Crittenden (community) code Approve
Review via email: mp+54041@code.qastaging.launchpad.net

Description of the change

Trivial fixes set aside from other branches.

    Launchpad bug:
        https://bugs.launchpad.net/bugs/703087
        https://bugs.launchpad.net/bugs/706967
        https://bugs.launchpad.net/bugs/732625
        https://bugs.launchpad.net/bugs/735944
    Pre-implementation: no one
    Test command: ./bin/test -vv \
      -t xx-productseries-link-branch -t doc/distribution-sourcepackage
      -t TestDistributionSourceView

There are small fixes I set aside form other branches or fixed while
triaging bugs.

Bug 703087 "Dotted outline of bug description runs through text, looks bad"
    The lazr edit classes confuses browsers which outline fields that
    are not *yet* editable.

Bug 706967 "Series page missing link to view code"
    when you go to a series page there is only a link to the development
    focus branch, not a link to directly jump to the content as well.
    The link was removed from the code portlet when was added on the
    project index...it needs to be added back to the series as well.

Bug #732625 "DSP display names are miscapitalized"
    'ubiquity in ubuntu' should be 'ubiquity in Ubuntu'.

Bug #735944 "DSP page shows bug counts, but distro does not use Launchpad"
    The page should not be showing the bugs or questions. The "Report a bug"
    and "Ask a question" links are correctly hidden.

--------------------------------------------------------------------

RULES

Bug 703087 "Dotted outline of bug description runs through text, looks bad"
    * Add a CSS rule to suppress outlining of the hidden text area.

Bug 706967 "Series page missing link to view code"
    * Add the link directly to the productseries-index template.

Bug #732625 "DSP display names are miscapitalized"
    * Update the dsp.displayname attr to use distribution.displayname
    * Fix the primary test. Expect to fix lots of stories after an ec2 run.

Bug #735944 "DSP page shows bug counts, but distro does not use Launchpad"
    * Add a tales guard to counts.

QA

Bug 703087 "Dotted outline of bug description runs through text, looks bad"
    * Visit https://bugs.qastaging.launchpad.net/launchpad/+bug/703087
    * Click on the text in the description
    * Verify that the entire description is not outlined.

Bug 706967 "Series page missing link to view code"
    * Visit https://qastaging.launchpad.net/launchpad/11.12
    * Verify there is a link to view the branch content in the
      Code for this series portlet.

Bug #732625 "DSP display names are miscapitalized"
    * Visit https://bugs.qastaging.launchpad.net/ubiquity
    * Verify the package name is 'ubiquity in Ubuntu'.

Bug #735944 "DSP page shows bug counts, but distro does not use Launchpad"
    * Visit https://qastaging.launchpad.net/debian/+source/bzr
    * Verify the page show not show counts for bugs and questions.

LINT

    lib/canonical/launchpad/icing/style-3-0.css.in
    lib/lp/registry/browser/distributionsourcepackage.py
    lib/lp/registry/browser/tests/test_distributionsourcepackage.py
    lib/lp/registry/doc/distribution-sourcepackage.txt
    lib/lp/registry/model/distributionsourcepackage.py
    lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt
    lib/lp/registry/templates/distributionsourcepackage-index.pt
    lib/lp/registry/templates/productseries-index.pt

^ lint hates the two doctests. I can clean them up before I land.

IMPLEMENTATION

Added a selector rule to disable the outline automatically added by many
browsers.
    lib/canonical/launchpad/icing/style-3-0.css.in

Restored the link that was removed 6 months ago.
    lib/lp/registry/stories/productseries/xx-productseries-link-branch.txt
    lib/lp/registry/templates/productseries-index.pt

Use the distro's displayname when making the dsp displayname. This is an
invasive change and I expect a lot of stories to need mechanical fixes
when the ec2 test completes.
    lib/lp/registry/doc/distribution-sourcepackage.txt
    lib/lp/registry/model/distributionsourcepackage.py

Added a attr to the view to help the template construct the sentence for
the services that are used.
    lib/lp/registry/browser/distributionsourcepackage.py
    lib/lp/registry/browser/tests/test_distributionsourcepackage.py
    lib/lp/registry/templates/distributionsourcepackage-index.pt

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :

Hi Curtis,

Thanks for the melange -- I'm sure it is gratifying to clear up so many things at once.

In your tests when checking for None how about using self.assertIs(None...) instead of assertFalse? Seems more precise and I think that is one of our corporate goals.

Also your test comment was copy-n-pasted and is not true for most: # The dict values are all None.

review: Approve (code)
Revision history for this message
Robert Collins (lifeless) wrote :

On Sat, Mar 19, 2011 at 9:17 AM, Brad Crittenden <email address hidden> wrote:
> Review: Approve code
> Hi Curtis,
>
> Thanks for the melange -- I'm sure it is gratifying to clear up so many things at once.
>
> In your tests when checking for None how about using self.assertIs(None...) instead of assertFalse?  Seems more precise and I think that is one of our corporate goals.

If False or 0 or '' would be wrong, then assertIs(None...) (or
assertEqual(None, ...) would be better. If False etc would be
acceptable, then assertFalse is better.

The comment in the test says 'are None', so I think either the comment
is wrong, or the assertions are wrong.

-Rob

Revision history for this message
Curtis Hovey (sinzui) wrote :

The comments were indeed wrong. The dict values are True or False. I am using assertTrue and assertFalse in the test.

Revision history for this message
Robert Collins (lifeless) wrote :

On Sun, Mar 20, 2011 at 2:28 AM, Curtis Hovey
<email address hidden> wrote:
> The comments were indeed wrong. The dict values are True or False. I am using assertTrue and assertFalse in the test.

If they are meant to be True and False specifically, I would use
assertEqual, not assertTrue/assertFalse - as I mentioned, assertTrue
and assertFalse look at the result of bool(thing) : so '' and None and
0 will all pass assertFalse, and '1', 10, True, object() will all pass
assertTrue.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.