Hi, The "Disable edge redirect" message is only shown when is_edge is true *and* site_message is set. The cover letter didn't mention that, but I assume that's fine. I have a few comments, but nothing terrible :) Gavin. > === modified file 'lib/canonical/launchpad/doc/timeout.txt' > --- lib/canonical/launchpad/doc/timeout.txt 2008-05-17 02:36:00 +0000 > +++ lib/canonical/launchpad/doc/timeout.txt 2010-03-10 16:32:41 +0000 > @@ -12,7 +12,7 @@ > >>> from canonical.lazr.timeout import get_default_timeout_function > >>> from canonical.launchpad.webapp.servers import ( > ... set_launchpad_default_timeout) > - >>> old_func = get_default_timeout_function() > + >>> old_func = get_default_timeout_function() > > >>> from zope.app.appsetup import ProcessStarting > > > === modified file 'lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt' > --- lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt 2010-02-09 17:25:13 +0000 > +++ lib/canonical/launchpad/pagetests/basics/demo-and-lpnet.txt 2010-03-10 16:32:41 +0000 > @@ -103,16 +103,18 @@ > ... 'a', onclick="setBetaRedirect(false)")) > Disable edge redirect. > > -The disable-redirect link will not appear in the site_message when > -browsed by non-beta users. > +The disable-redirect link will also appear in the site_message when browsed by > +non-beta/anonymous users. This is to reduce the annoyance when users are > +logged into launchpad.net but haven't noticed yet that they need to log into > +edge as well (https://launchpad.net/bugs/160191). > > >>> browser.open('http://launchpad.dev/ubuntu') > >>> print extract_text(find_tags_by_class( > ... browser.contents, 'sitemessage')[0]) > - This is a beta site. > + This is a beta site. Disable edge redirect. > > -Similarly, once the redirection has been inhibited, the link changes to > -enable redirects.. > +Once the redirection has been inhibited, the link changes to enable > +redirects. > > # Workaround bug in mechanize where you cannot use the Cookie > # header with the CookieJar > @@ -135,7 +137,6 @@ > ... 'a', onclick="setBetaRedirect(true)")) > Enable edge redirect. > > - > # Remove the specific site-message config data before continuing. > >>> dummy = config.pop('edge_config_data') > > > === modified file 'lib/canonical/launchpad/templates/launchpad-requestexpired.pt' > --- lib/canonical/launchpad/templates/launchpad-requestexpired.pt 2009-07-28 17:19:42 +0000 > +++ lib/canonical/launchpad/templates/launchpad-requestexpired.pt 2010-03-10 16:32:41 +0000 > @@ -9,27 +9,16 @@ > >
>

Timeout error

> -
- id="redirect_notice" style="display:none" class="informational message"> > -

Our edge server has a lower timeout threshold than launchpad.net, > - so we can catch those before they hit a wider audience. > - As a member of the Launchpad Beta Testers team, you're more > - likely to experience them. If this is blocking your work, you > - can disable redirection.

> -

> +
+ id="redirect_notice" class="informational message"> > +

Our edge server has a lower timeout threshold than launchpad.net, > + so we can catch those before they hit a wider audience. > + As a member of the Launchpad Beta Testers team, you're more You haven't changed it, but this isn't strictly true - that the viewer is a beta tester - any more is it? Doesn't matter much though. > + likely to experience them. If this is blocking your work, you > + can disable redirection.

> +

>
> - >

> Sorry, something just went wrong in Launchpad. >

> > === modified file 'lib/canonical/launchpad/templates/oops.pt' > --- lib/canonical/launchpad/templates/oops.pt 2010-01-13 17:58:30 +0000 > +++ lib/canonical/launchpad/templates/oops.pt 2010-03-10 16:32:41 +0000 > @@ -9,6 +9,9 @@ > > + > + > + > > >
> > === modified file 'lib/canonical/launchpad/webapp/error.py' > --- lib/canonical/launchpad/webapp/error.py 2009-12-23 16:17:12 +0000 > +++ lib/canonical/launchpad/webapp/error.py 2010-03-10 16:32:41 +0000 > @@ -26,12 +26,13 @@ > from canonical.cachedproperty import cachedproperty > from canonical.config import config > import canonical.launchpad.layers > +from canonical.launchpad.webapp.publisher import LaunchpadView > from canonical.launchpad.webapp.adapter import ( > clear_request_started, set_request_started) > from canonical.launchpad.webapp.interfaces import ILaunchBag > > > -class SystemErrorView: > +class SystemErrorView(LaunchpadView): > """Helper class for views on exceptions. > > Also, sets a 500 response code. > @@ -64,8 +65,7 @@ > safe_to_show_in_restricted_mode = False > > def __init__(self, context, request): > - self.context = context > - self.request = request > + super(SystemErrorView, self).__init__(context, request) > self.request.response.removeAllNotifications() > if self.response_code is not None: > self.request.response.setStatus(self.response_code) > > === modified file 'lib/lp/app/stories/basics/xx-beta-testers-redirection.txt' > --- lib/lp/app/stories/basics/xx-beta-testers-redirection.txt 2010-02-09 17:25:13 +0000 > +++ lib/lp/app/stories/basics/xx-beta-testers-redirection.txt 2010-03-10 16:32:41 +0000 > @@ -216,11 +216,12 @@ > > >>> logout() > > -Decrease the timeout values for launchpad.dev > +Decrease the timeout values for launchpad.dev and pretend we're on the edge > +server. > > >>> beta_data = """ > ... [launchpad] > - ... beta_testers_redirection_host = edge.launchpad.dev > + ... is_edge: True > ... [database] > ... db_statement_timeout: 1 > ... soft_request_timeout: 2 > @@ -240,7 +241,7 @@ > Error: Timeout > ... >

Timeout error

> - > ... > > Restore the config to state it was in at the start of the test. > > === modified file 'lib/lp/app/templates/base-layout-macros.pt' > --- lib/lp/app/templates/base-layout-macros.pt 2010-03-05 02:57:25 +0000 > +++ lib/lp/app/templates/base-layout-macros.pt 2010-03-10 16:32:41 +0000 > @@ -379,16 +379,14 @@ > This site is running pre-release code. > > > - > - - tal:condition="not:view/isRedirectInhibited"> > - Disable edge redirect. > - > - - tal:condition="view/isRedirectInhibited"> > - Enable edge redirect. > - > - > + + tal:condition="not:view/isRedirectInhibited"> > + Disable edge redirect. > + > + + tal:condition="view/isRedirectInhibited"> > + Enable edge redirect. > + > >
> >