Merge lp:~ivo-kracht/launchpad/bug-353097 into lp:launchpad

[Ivo Kracht]

fix for bug 353097: Marking a Bug as "Requiring Forwarding" text is missleading...

I changed the misleading text to <<I want to add this upstream project to the bug report, but someone must find or report this bug in the upstream bug tracker>> as proposed by Curtis Hovey in the bug discussion and changed several tests which checked the text.

Pre-imp call with adeuring

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  lib/lp/bugs/browser/bugalsoaffects.py
  lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt
  lib/lp/bugs/stories/bug-also-affects/xx-bugtracker-information.txt
  lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt

./lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt
     261: want exceeds 78 characters.
./lib/lp/bugs/stories/bug-also-affects/xx-bugtracker-information.txt
       1: narrative uses a moin header.
./lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt
      40: Comment belongs in narrative.
      41: Comment belongs in narrative.
       1: narrative uses a moin header.
      11: narrative uses a moin header.

These errors existed before and have nothing to do with my changes so I didn't fix them.

Tests:
./bin/test bugs -t xx-bugtracker-information.txt
./bin/test bugs -t xx-bug-also-affects.txt

[Francesco Banconi (frankban)]

Looks good, thank you.
Tests pass (also xx-advanced-upstream-pending-bugwatch.txt): waiting for Raphael review.

review: Approve (code*)

[Raphaël Badin (rvb)]

A great first contribution, thanks Ivo!

review: Approve

=== modified file 'lib/lp/bugs/browser/bugalsoaffects.py'
--- lib/lp/bugs/browser/bugalsoaffects.py	2012-02-01 15:46:43 +0000
+++ lib/lp/bugs/browser/bugalsoaffects.py	2012-06-13 10:04:24 +0000
@@ -511,8 +511,8 @@
 #    mailing lists."
 
     UNLINKED_UPSTREAM = Item(
-        """I just want to register that it is upstream right now; \
-           I don't have any way to link it.
+        """I want to add this upstream project to the bug report, but someone\
+        must find or report this bug in the upstream bug tracker.
 
         Launchpad will record that.
         """)

=== modified file 'lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt'
--- lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt	2012-04-04 05:46:26 +0000
+++ lib/lp/bugs/stories/bug-also-affects/xx-bug-also-affects.txt	2012-06-13 10:04:24 +0000
@@ -284,20 +284,22 @@
         [          ]
     ( ) I have already emailed an upstream bug contact:
         [          ]
-    ( ) I just want to register that it is upstream right now; I
-        don't have any way to link it.
+    ( ) I want to add this upstream project to the bug report, but
+        someone must find or report this bug in the upstream bug
+        tracker.
 
 We can just link upstream without a URL to say that this has been dealt
 with, but we can't reference it.
 
-    >>> user_browser.getControl('I just want to register').selected = True
+    >>> user_browser.getControl('I want to add this upstream').selected = True
     >>> print_upstream_linking_form(user_browser)
     ( ) I have the URL for the upstream bug:
         [          ]
     ( ) I have already emailed an upstream bug contact:
         [          ]
-    (*) I just want to register that it is upstream right now; I
-        don't have any way to link it.
+    (*) I want to add this upstream project to the bug report, but
+        someone must find or report this bug in the upstream bug
+        tracker.
 
     >>> user_browser.getControl('Add to Bug Report').click()
     >>> print user_browser.url
@@ -638,8 +640,9 @@
         [          ]
     (*) I have already emailed an upstream bug contact:
         [[e-mail]]
-    ( ) I just want to register that it is upstream right now; I
-        don't have any way to link it.
+    ( ) I want to add this upstream project to the bug report, but
+        someone must find or report this bug in the upstream bug
+        tracker.
 
 The bug tracker is automatically created without asking for
 confirmation.

=== modified file 'lib/lp/bugs/stories/bug-also-affects/xx-bugtracker-information.txt'
--- lib/lp/bugs/stories/bug-also-affects/xx-bugtracker-information.txt	2009-06-12 16:36:02 +0000
+++ lib/lp/bugs/stories/bug-also-affects/xx-bugtracker-information.txt	2012-06-13 10:04:24 +0000
@@ -19,8 +19,8 @@
         [          ]
     ( ) I have already emailed an upstream bug contact:
         [          ]
-    ( ) I just want to register that it is upstream right now; I
-        don't have any way to link it.
+    ( ) I want to add this upstream project to the bug report, but someone
+        must find or report this bug in the upstream bug tracker.
 
 If a product doesn't use Launchpad, and doesn't have a bug tracker
 specified, it will simply say that it doesn't use Launchpad to track
@@ -38,8 +38,8 @@
         [          ]
     ( ) I have already emailed an upstream bug contact:
         [          ]
-    ( ) I just want to register that it is upstream right now; I
-        don't have any way to link it.
+    ( ) I want to add this upstream project to the bug report, but someone
+        must find or report this bug in the upstream bug tracker.
 
 For products using Launchpad, the linking upstream widgets won't even
 appear.

=== modified file 'lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt'
--- lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2012-02-17 23:00:56 +0000
+++ lib/lp/bugs/stories/bugtask-searches/xx-advanced-upstream-pending-bugwatch.txt	2012-06-13 10:04:24 +0000
@@ -28,7 +28,7 @@
 
     >>> browser.getLink('Also affects project').click()
     >>> browser.getControl(
-    ...     'I just want to register that it is upstream').selected = True
+    ...     'I want to add this upstream project').selected = True
     >>> browser.getControl('Add to Bug Report').click()
     >>> browser.title
     'Bug #... : Bugs : alsa-utils'