Merge lp:~nataliabidart/ubuntu-sso-client/clean-captcha-error-1-2 into lp:ubuntu-sso-client/stable-1-2

[Natalia Bidart]

- Captcha load warning is removed when retry is successful (LP: #703115).

[Eric Casteleijn (thisfred)]

looks good

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2011-03-16 01:36:07 +0000
+++ ubuntu_sso/gtk/gui.py	2011-03-30 17:34:24 +0000
@@ -526,6 +526,7 @@
         """Ask for a new captcha; update the ui to reflect the fact."""
         logger.info('Calling generate_captcha with filename path at %r',
                     self._captcha_filename)
+        self.warning_label.set_text('')
         self.backend.generate_captcha(self.app_name, self._captcha_filename,
                                       reply_handler=NO_OP, error_handler=NO_OP)
         self._set_captcha_loading()
 
=== modified file 'ubuntu_sso/gtk/tests/test_gui.py'
--- ubuntu_sso/gtk/tests/test_gui.py	2011-03-16 01:36:07 +0000
+++ ubuntu_sso/gtk/tests/test_gui.py	2011-03-30 17:34:24 +0000
@@ -880,6 +880,12 @@
                                           self.ui.CAPTCHA_LOAD_ERROR)
         self.assertEqual(self._called, ((), {}))
 
+    def test_captcha_success_after_error(self):
+        """When captcha was retrieved after error, the warning is removed."""
+        self.ui.on_captcha_generation_error(APP_NAME, error=self.error)
+        self.ui.on_captcha_generated(app_name=APP_NAME, captcha_id=CAPTCHA_ID)
+        self.assertEqual(self.ui.warning_label.get_text(), '')
+
 
 class NoTermsAndConditionsTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration (with no t&c link)."""