Merge lp:~elachuni/piston-mini-client/304-is-valid-response-status into lp:piston-mini-client

[Anthony Lenton]

This branch avoids 304 responses from the server being raised as APIErrors.
Also, a test was added for the full list of valid status codes.

[Michael Nelson (michael.nelson)]

Nice - isn't Mock great ;)

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2010-11-17 01:33:04 +0000
+++ .bzrignore	2010-12-21 13:51:12 +0000
@@ -1,3 +1,3 @@
 .coverage
-cover
+htmlcov
 doc/_build

=== modified file 'piston_mini_client/__init__.py'
--- piston_mini_client/__init__.py	2010-12-09 21:02:11 +0000
+++ piston_mini_client/__init__.py	2010-12-21 13:51:12 +0000
@@ -178,7 +178,7 @@
                 raise APIError('Unable to connect to %s' % self._service_root)
             else:
                 raise
-        if response['status'] not in ['200', '201']:
+        if response['status'] not in ['200', '201', '304']:
             raise APIError('%s: %s\n-----\n%s' % (response['status'],
                 response, body))
         return response, body

=== modified file 'piston_mini_client/test/test_resource.py'
--- piston_mini_client/test/test_resource.py	2010-12-09 21:02:11 +0000
+++ piston_mini_client/test/test_resource.py	2010-12-21 13:51:12 +0000
@@ -1,3 +1,4 @@
+from mock import patch
 from unittest import TestCase
 from wsgi_intercept import add_wsgi_intercept, remove_wsgi_intercept
 from wsgi_intercept.httplib2_intercept import install, uninstall
@@ -75,6 +76,16 @@
         self.assertEqual('/stew', self.called['path'])
         self.assertEqual('foo=bar', self.called['query'])
 
+    @patch('httplib2.Http.request')
+    def test_valid_status_codes_dont_raise_exception(self, mock_request):
+        for status in ['200', '201', '304']:
+            expected_response = {'status': status}
+            expected_body = '"hello world!"'
+            mock_request.return_value = (expected_response, expected_body)
+            api = self.CoffeeAPI()
+            response, body = api._get('/simmer')
+            self.assertEqual(expected_response, response)
+
     def test_get_with_extra_args(self):
         api = self.CoffeeAPI()
         api._get('/stew?zot=ping', args={'foo': 'bar'})