Merge lp:~lifeless/launchpad/bug-1011390 into lp:launchpad

[Robert Collins]

Support the new oops.canonical.com

The existing lp-oops.canonical.com site will go into readonly mode shortly, so we should stop linking to it. This will naturally break links to older oopses which are only on the old site, because linkification can't sensibly link to both.

Along the way, we want to be sure we capture OOPS references in urls pointing to either site, so I tweaked a test upwards to support that.

The extra LOC can be offset against the 1000 credit I have coming in with memcache cleanups.

[Stuart Bishop (stub)]

Looks good.

review: Approve

[Stuart Bishop (stub)]

with ec2 land

=== modified file 'lib/lp/app/doc/displaying-paragraphs-of-text.txt'
--- lib/lp/app/doc/displaying-paragraphs-of-text.txt	2012-04-02 05:42:19 +0000
+++ lib/lp/app/doc/displaying-paragraphs-of-text.txt	2012-06-11 04:06:19 +0000
@@ -431,21 +431,21 @@
     True
 
     >>> print test_tales('foo/fmt:text-to-html', foo=text)
-    <p><a href="https://lp-oops.canonical.com/oops.py/?oopsid=OOPS-38C23">OOPS-38C23</a></p>
+    <p><a href="https://oops.canonical.com/oops/?oopsid=OOPS-38C23">OOPS-38C23</a></p>
 
 OOPS references can take a number of forms:
 
     >>> text = 'OOPS-38C23'
     >>> print test_tales('foo/fmt:text-to-html', foo=text)
-    <p><a href="https://lp-oops.canonical.com/oops.py/?oopsid=OOPS-38C23">OOPS-38C23</a></p>
+    <p><a href="https://oops.canonical.com/oops/?oopsid=OOPS-38C23">OOPS-38C23</a></p>
 
     >>> text = 'OOPS-123abcdef'
     >>> print test_tales('foo/fmt:text-to-html', foo=text)
-    <p><a href="https://lp-oops.canonical.com/oops.py/?oopsid=OOPS-123abcdef">OOPS-123abcdef</a></p>
+    <p><a href="https://oops.canonical.com/oops/?oopsid=OOPS-123abcdef">OOPS-123abcdef</a></p>
 
     >>> text = 'OOPS-abcdef123'
     >>> print test_tales('foo/fmt:text-to-html', foo=text)
-    <p><a href="https://lp-oops.canonical.com/oops.py/?oopsid=OOPS-abcdef123">OOPS-abcdef123</a></p>
+    <p><a href="https://oops.canonical.com/oops/?oopsid=OOPS-abcdef123">OOPS-abcdef123</a></p>
 
 If the configuration value doesn't end with a slash, we won't add one. This
 lets us configure the URL to use query parameters.

=== modified file 'lib/lp/registry/tests/test_oopsreferences.py'
--- lib/lp/registry/tests/test_oopsreferences.py	2012-01-25 04:01:19 +0000
+++ lib/lp/registry/tests/test_oopsreferences.py	2012-06-11 04:06:19 +0000
@@ -173,17 +173,23 @@
         # a reference even though they are not formatted specially - this
         # requires somewhat special handling in the reference calculation
         # function.
-        oopsid = "OOPS-abcdef1234"
-        bug = self.factory.makeBug()
-        with person_logged_in(bug.owner):
-            bug.description = (
+        oopsid_old = "OOPS-abcdef1234"
+        oopsid_new = "OOPS-4321"
+        bug_old = self.factory.makeBug()
+        bug_new = self.factory.makeBug()
+        with person_logged_in(bug_old.owner):
+            bug_old.description = (
                 "foo https://lp-oops.canonical.com/oops.py?oopsid=%s bar"
-                % oopsid)
-            self.store.flush()
+                % oopsid_old)
+        with person_logged_in(bug_new.owner):
+            bug_new.description = (
+                "foo https://oops.canonical.com/oops.py?oopsid=%s bar"
+                % oopsid_new)
+        self.store.flush()
         now = datetime.now(tz=utc)
         day = timedelta(days=1)
         self.failUnlessEqual(
-            set([oopsid]),
+            set([oopsid_old, oopsid_new]),
             referenced_oops(now - day, now, "product=1", {}))
         self.failUnlessEqual(
             set([]),

=== modified file 'lib/lp/services/config/schema-lazr.conf'
--- lib/lp/services/config/schema-lazr.conf	2012-06-03 23:11:40 +0000
+++ lib/lp/services/config/schema-lazr.conf	2012-06-11 04:06:19 +0000
@@ -986,7 +986,7 @@
 
 # OOPS reports root for linking to OOPS reports.
 # datatype: urlbase
-oops_root_url: https://lp-oops.canonical.com/oops.py/?oopsid=
+oops_root_url: https://oops.canonical.com/oops/?oopsid=
 
 # Domain part of the bugs' email addresses. All email addresses in
 # this domain should get redirected to the MailIntoLaunchpad handler.