Merge lp:~bloodearnest/canonical-identity-provider/ssoclient-502 into lp:~canonical-isd-hackers/canonical-identity-provider/ssoclient

[Simon Davy]

Change CAPTCHA_ERROR code from 504 to 502

Change CAPTCHA_ERROR code from 504 to 502

[Ricardo Kirkner (ricardokirkner)]

LGTM

review: Approve

=== modified file 'ssoclient/tests/test_v2.py'
--- ssoclient/tests/test_v2.py	2013-05-22 17:23:24 +0000
+++ ssoclient/tests/test_v2.py	2013-05-24 12:29:29 +0000
@@ -128,7 +128,7 @@
         with self.assertRaises(errors.CaptchaFailure):
             self.client.register(email='blah')
 
-    @patch(REQUEST, return_value=mock_response(504, code="CAPTCHA_ERROR"))
+    @patch(REQUEST, return_value=mock_response(502, code="CAPTCHA_ERROR"))
     def test_register_captcha_error(self, mock_request):
         with self.assertRaises(errors.CaptchaError):
             self.client.register(email='blah')

=== modified file 'ssoclient/v2/errors.py'
--- ssoclient/v2/errors.py	2013-05-22 16:52:20 +0000
+++ ssoclient/v2/errors.py	2013-05-24 12:29:29 +0000
@@ -58,6 +58,6 @@
     error_code = "ALREADY_REGISTERED"
 
 
-# 504
+# 502
 class CaptchaError(ApiException):
     error_code = "CAPTCHA_ERROR"