Merge lp:~gary/launchpad/opstats-nodb into lp:launchpad/db-devel

[Gary Poster]

[Gary Poster (gary)]

This branch fixes the errors shown in the recent buildbot run for db-devel (https://lpbuildbot.canonical.com/builders/db_lp/builds/313/steps/shell_7/logs/summary).

The comment additions hopefully explain the purpose of the changes.

To test the formerly failing tests, use this command:

./bin/test -vv -ttest_other_request_uses_LaunchpadDatabasePolicy -ttest_read_only_mode_uses_ReadOnlyLaunchpadDatabasePolicy -twebapp-publication.txt

To test the pertinent test that stub added for this code, run this command:

./bin/test -vvtxx-opstats.txt

Thank you

Gary

[Edwin Grubbs (edwin-grubbs)]

merge-approved

review: Approve (code)

=== modified file 'lib/canonical/launchpad/webapp/dbpolicy.py'
--- lib/canonical/launchpad/webapp/dbpolicy.py	2009-12-02 11:57:11 +0000
+++ lib/canonical/launchpad/webapp/dbpolicy.py	2009-12-02 19:40:39 +0000
@@ -157,8 +157,10 @@
     # We need to select a non-load balancing DB policy for +opstats so
     # it doesn't query the DB for lag information (this page should not
     # hit the database at all). We haven't traversed yet, so we have
-    # to sniff the request this way.
-    if request['PATH_INFO'] == u'/+opstats':
+    # to sniff the request this way.  Even though PATH_INFO is always
+    # present in real requests, we need to tread carefully (``get``) because
+    # of test requests in our automated tests.
+    if request.get('PATH_INFO') == u'/+opstats':
         return DatabaseBlockedPolicy(request)
     elif config.launchpad.read_only:
         return ReadOnlyLaunchpadDatabasePolicy(request)