Merge lp:~leonardr/lazr.restfulclient/test-long-etag into lp:lazr.restfulclient

[Leonard Richardson]

Ignore the name of this branch; the thing I was testing didn't need any changes, but I found some test failures while I was testing.

A new version of simplejson breaks some lazr.restfulclient tests: what used to be a ValueError is now a JSONDecodeError. I had code that created a fake web service and interpreted a ValueError as a sign that a client had managed to authenticate with the service--since the web service didn't actually serve any JSON, the client's next step after authenticating ended in failure.

I decided to fix the tests by making the fake web service a little better, making it serve some (fake) JSON, so that if the client authenticates with the fake web service there will be no error at all.

To keep the fake web service simple, I removed some no-longer-needed code that was used to fix bug 457146. Since Launchpad now runs a version of lazr.restful that doesn't have bug 457146 (and has for months), I think it's safe to remove the client-side hack. I won't remove the corresponding code from lazr.restful, because old versions of lazr.restfulclient are still around and manifesting bug 457146.

[Brad Crittenden (bac)]

review: Approve (code)

=== modified file 'src/lazr/restfulclient/NEWS.txt'
--- src/lazr/restfulclient/NEWS.txt	2010-03-09 19:50:44 +0000
+++ src/lazr/restfulclient/NEWS.txt	2010-03-16 16:04:19 +0000
@@ -2,6 +2,12 @@
 NEWS for lazr.restfulclient
 ===========================
 
+0.9.13 (Development)
+===================
+
+- Removed of some no-longer-needed compatibility code for buggy
+  servers, and fixed the tests to work with the new release of simplejson.
+
 0.9.12 (2010-03-09)
 ===================
 

=== modified file 'src/lazr/restfulclient/_browser.py'
--- src/lazr/restfulclient/_browser.py	2010-03-09 15:20:23 +0000
+++ src/lazr/restfulclient/_browser.py	2010-03-16 16:04:19 +0000
@@ -270,14 +270,8 @@
 
     def get_wadl_application(self, url):
         """GET a WADL representation of the resource at the requested url."""
-        # We're probably talking to an old version of lazr.restful
-        # that misspells the WADL media type. Accept either the correctly
-        # spelled media type or the misspelling.
         wadl_type = 'application/vnd.sun.wadl+xml'
-        misspelled_wadl_type = 'application/vd.sun.wadl+xml'
-        accept = "%s, %s" % (wadl_type, misspelled_wadl_type)
-        response, content = self._request(
-            url, media_type=wadl_type, extra_headers={'Accept': accept})
+        response, content = self._request(url, media_type=wadl_type)
         return Application(str(url), content)
 
     def post(self, url, method_name, **kws):

=== modified file 'src/lazr/restfulclient/docs/authorizer.txt'
--- src/lazr/restfulclient/docs/authorizer.txt	2009-12-14 21:04:46 +0000
+++ src/lazr/restfulclient/docs/authorizer.txt	2010-03-16 16:04:19 +0000
@@ -15,10 +15,15 @@
     >>> wadl_string = pkg_resources.resource_string(
     ...     'wadllib.tests.data', 'launchpad-wadl.xml')
 
+    >>> responses = { 'application/vnd.sun.wadl+xml' : wadl_string,
+    ...               'application/json' : '{}' }
+
     >>> def dummy_application(environ, start_response):
+    ...     media_type = environ['HTTP_ACCEPT']
+    ...     content = responses[media_type]
     ...     start_response(
-    ...         '200', [('Content-type','application/vnd.sun.wadl+xml')])
-    ...     return [wadl_string]
+    ...         '200', [('Content-type', media_type)])
+    ...     return [content]
 
 
 The WADL file will be protected with HTTP Basic Auth. To access it,
@@ -73,14 +78,11 @@
 
 If we provide the right credentials, we can retrieve the WADL. We'll
 still get an exception, because our fake web service is too fake for
-ServiceRoot--it doesn't serve any JSON resources--but we're able to
-make HTTP requests without getting 401 errors.
+ServiceRoot--its 'service root' resource doesn't match the WADL--but
+we're able to make HTTP requests without getting 401 errors.
 
     >>> authorizer = BasicHttpAuthorizer("user", "password")
     >>> client = ServiceRoot(authorizer, "http://api.launchpad.dev/")
-    Traceback (most recent call last):
-    ...
-    ValueError: No JSON object could be decoded
 
 Teardown.
 
@@ -178,9 +180,6 @@
     >>> authorizer = OAuthAuthorizer(
     ...     valid_consumer.key, access_token=valid_token)
     >>> client = ServiceRoot(authorizer, "http://api.launchpad.dev/")
-    Traceback (most recent call last):
-    ...
-    ValueError: No JSON object could be decoded
 
 It's even possible to get anonymous access by providing an empty
 access token.
@@ -188,9 +187,6 @@
     >>> authorizer = OAuthAuthorizer(
     ...     valid_consumer, access_token=empty_token)
     >>> client = ServiceRoot(authorizer, "http://api.launchpad.dev/")
-    Traceback (most recent call last):
-    ...
-    ValueError: No JSON object could be decoded
 
 Because of the way the AnonymousAccessDataStore (defined
 earlier in the test) works, you can even get anonymous access by
@@ -200,9 +196,6 @@
     >>> authorizer = OAuthAuthorizer(
     ...     "random consumer", access_token=empty_token)
     >>> client = ServiceRoot(authorizer, "http://api.launchpad.dev/")
-    Traceback (most recent call last):
-    ...
-    ValueError: No JSON object could be decoded
 
 If you try to provide credentials with an unrecognized OAuth consumer,
 you'll get an error--even if the credentials are valid. The data store

=== modified file 'src/lazr/restfulclient/version.txt'
--- src/lazr/restfulclient/version.txt	2010-03-09 15:28:38 +0000
+++ src/lazr/restfulclient/version.txt	2010-03-16 16:04:19 +0000
@@ -1,1 +1,1 @@
-0.9.12
+0.9.13