Merge lp:~rharding/launchpad/updated_wally_use_convoy into lp:launchpad

[Richard Harding]

Short cut features checks on error pages and adjust tests for changes in use-convoy branch.

= Summary =
There were some failing tests when trying to ec2 land the use-convoy branch.

== Fixes and implementation details ==
The first error was that the url for the YUI2 calendar was altered during preparing the JS build directory. That path was updated (it's not under app any longer).

The second error was that the geo location code was returning a float value of 2.9999999999. This seems a bit spurious, and since it's a LAT value, if it's off by that little it won't effect the map loading. So I updated the doctest to round out to 4 decimal places and make sure that equals our expected value. That should be a small enough difference to be able to ignore.

The third was that during db errors, the request dies out early and the feature flag code isn't neutered with a NullFeatureController. This causes the base layout macros file to bomb when it checks if you've gotten the feature flag for the combo loader. I've added the setup of the NullFeatureController to the SystemErrorView so that it's prepared and ready for the check to fail gracefully in the .pt file.

== Tests ==
./bin/test -x -cvvt "test_error"
./bin/test -x -cvvt "xx-private-ppa"
./bin/test -x -cvvt "app.*browser.*tests"

[Benji York (benji)]

This branch looks fine. Two small suggestions:

The "print" in "print round(widget.center_lng, 5)" is superfluous.

It would be nice if the comment on line 32 of the diff explained why
injecting the NullFeatureController was necessary.

review: Approve (code)

=== modified file 'lib/lp/app/widgets/doc/location-widget.txt'
--- lib/lp/app/widgets/doc/location-widget.txt	2012-01-23 21:27:27 +0000
+++ lib/lp/app/widgets/doc/location-widget.txt	2012-01-23 21:27:28 +0000
@@ -62,7 +62,7 @@
     9
     >>> widget.center_lat
     52...
-    >>> widget.center_lng
+    >>> print round(widget.center_lng, 5)
     0.3...
     >>> widget.show_marker
     1

=== modified file 'lib/lp/services/webapp/error.py'
--- lib/lp/services/webapp/error.py	2012-01-01 02:58:52 +0000
+++ lib/lp/services/webapp/error.py	2012-01-23 21:27:28 +0000
@@ -25,7 +25,9 @@
 from zope.interface import implements
 
 import lp.layers
+from lp.services import features
 from lp.services.config import config
+from lp.services.features.flags import NullFeatureController
 from lp.services.propertycache import cachedproperty
 from lp.services.webapp.interfaces import ILaunchBag
 from lp.services.webapp.publisher import LaunchpadView
@@ -70,6 +72,13 @@
         if getattr(self.request, 'oopsid') is not None:
             self.request.response.addHeader(
                 'X-Lazr-OopsId', self.request.oopsid)
+
+        # Need to neuter the feature flags on error output. The base template
+        # checks for a feature flag, but they depend on db access which might
+        # not have been setup yet.
+        request.features = NullFeatureController()
+        features.install_feature_controller(request.features)
+
         self.computeDebugOutput()
         if config.canonical.show_tracebacks:
             self.show_tracebacks = True

=== modified file 'lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt'
--- lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-01-15 13:32:27 +0000
+++ lib/lp/soyuz/stories/ppa/xx-private-ppa-subscriptions.txt	2012-01-23 21:27:28 +0000
@@ -54,7 +54,7 @@
     >>> print extract_all_script_and_style_links(cprov_browser.contents)
     /...
     ...
-    http://launchpad.dev/+icing/.../build/app/calendar.js
+    http://launchpad.dev/+icing/.../build/calendar/calendar.js
     http://launchpad.dev/+icing/.../yui_2.7.0b/build/calendar/assets/skins/sam/calendar.css
 
 Initially there are no subscriptions for a newly privatized PPA (although,