Merge lp:~bac/launchpad/bug-569101 into lp:launchpad

[Brad Crittenden]

Uppercase the request method to fix a bug using launchpadlib in the test environment.

= Summary =

Using lplib in the test environment is broken for many calls as the
REQUEST_METHOD is sent as 'get' but expected as GET.

== Proposed fix ==

Uppercase the method in the testing layer before sending it on.

== Pre-implementation notes ==

Fix suggested by Leonard.

== Implementation details ==

As above.

== Tests ==

bin/test -vvt webservice/launchpadlib.txt

The test that exercises the new piece is the anonymous search. It is a
bit contrived but I wanted something that would be around for regression
testing but would also add some explanatory comment. The risk is a
developer in the future will think it is dumb and will remove it.

== Demo and Q/A ==

N/A

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt
  lib/canonical/testing/layers.py

== Pyflakes Doctest notices ==

lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt
    11: undefined name 'launchpadlib_for'

== Pyflakes notices ==

lib/canonical/testing/layers.py
    508: redefinition of unused 'pidfile' from line 95

[Curtis Hovey (sinzui)]

Thanks for providing this fix. At least some good will come from your trial with delete.

review: Approve

=== modified file 'lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt'
--- lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	2010-03-31 19:54:31 +0000
+++ lib/canonical/launchpad/pagetests/webservice/launchpadlib.txt	2010-04-23 18:46:30 +0000
@@ -42,9 +42,29 @@
     >>> print credentials.access_token
     oauth_token_secret=...&oauth_token=...
 
-This can be used to create your own Launchpad object.
+This can be used to create your own Launchpad object.  Note you cannot
+use launchpadlib.uris.DEV_SERVICE_ROOT as the URL as it uses the https
+scheme which does not work in the test environment.
 
     >>> from launchpadlib.launchpad import Launchpad
     >>> launchpad = Launchpad(credentials, 'http://api.launchpad.dev/')
     >>> print launchpad.me.name
     no-priv
+
+    >>> lp_anon = Launchpad.login_anonymously('launchpadlib test',
+    ...                                       'http://api.launchpad.dev/')
+
+The Launchpad object for the anonymous user can be used to access
+public information.
+
+    >>> apache_results = lp_anon.project_groups.search(text="Apache")
+    >>> print apache_results[0].name
+    apache
+
+But trying to access information that requires a logged in user
+results in an error.
+
+    >>> print lp_anon.me.name
+    Traceback (most recent call last):
+      ...
+    HTTPError: HTTP Error 401: Unauthorized...

=== modified file 'lib/canonical/testing/layers.py'
--- lib/canonical/testing/layers.py	2010-04-06 13:41:11 +0000
+++ lib/canonical/testing/layers.py	2010-04-23 18:46:30 +0000
@@ -892,6 +892,11 @@
     if environ.pop('HTTP_X_ZOPE_HANDLE_ERRORS', 'True') == 'False':
         environ['wsgi.handleErrors'] = False
     handle_errors = environ.get('wsgi.handleErrors', True)
+
+    # Make sure the request method is something Launchpad will
+    # recognize. httplib2 usually takes care of this, but we've
+    # bypassed that code in our test environment.
+    environ['REQUEST_METHOD'] = environ['REQUEST_METHOD'].upper()
     # Now we do the proper dance to get the desired request.  This is an
     # almalgam of code from zope.app.testing.functional.HTTPCaller and
     # zope.publisher.paste.Application.