Merge lp:~ralsina/ubuntu-sso-client/fix_805405 into lp:ubuntu-sso-client

[Roberto Alsina]

Fix an exception when the user entered the captcha wrong, show a message instead of a dict in another case.

Fix an exception when the user entered the captcha wrong, show a message instead of a dict in another case.

[Natalia Bidart (nataliabidart)]

== Python Lint Notices ==

ubuntu_sso/qt/tests/test_windows.py:
    403: [C0111, FakeMessageBox.critical] Missing docstring
    406: [C0111, FakeView] Missing docstring
    409: [C0111, FakeView.wizard] Missing docstring
    429: [C0324, SetupAccountControllerTest2.test_on_user_registration_refresh_captcha] Comma not followed by a space
            self.controller.on_user_registration_error('TestApp',{})
                                                                ^^
    430: [C0324, SetupAccountControllerTest2.test_on_user_registration_refresh_captcha] Comma not followed by a space
            self.assertEqual(self._called,((),{}))
                                         ^^
    441: [E0102, SetupAccountControllerTest2.test_on_user_registration_all_only] method already defined line 432

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Pep8 issues:

ubuntu_sso/qt/tests/test_windows.py:456:48: E202 whitespace before '}'
ubuntu_sso/qt/tests/test_windows.py:461:80: E202 whitespace before ')'

review: Needs Fixing

[Natalia Bidart (nataliabidart)]

Works great!

review: Approve

[Manuel de la Peña (mandel)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~ralsina/ubuntu-sso-client/fix_805405 into lp:ubuntu-sso-client failed. Below is the output from the failed tests.

Running test suite for ubuntu_sso
Xlib: extension "RANDR" missing on display ":99".
ubuntu_sso.utils.tests.test_ui
  GetPasswordStrengTestCase
    test_eight_chars_and_num ... [OK]
    test_eight_chars_low_and_cap ... [OK]
    test_eight_chars_low_canp_num ... [OK]
    test_eight_chars_password ... [OK]
    test_eiqgh_chars_and_special ... [OK]
    test_eleven_chars_and_num ... [OK]
    test_eleven_chars_low_cap ... [OK]
    test_eleven_num_low_cap ... [OK]
    test_eleven_num_special ... [OK]
    test_long_password ... [OK]
    test_small_password ... [OK]
    test_too_small_password ... [OK]
  IsCorrectEmailAddress
    test_is_correct_email_false ... [OK]
    test_is_correct_email_true ... [OK]
  IsMinRequiredPasswordTestCase
    test_correct_password ... [OK]
    test_no_enough_chars ... [OK]
    test_no_number ... [OK]
    test_no_uppercase ... [OK]
ubuntu_sso.utils.tests.test_txsecrets
  AltItemTestCase
    test_create_item_four_fields_per_secret ... [OK]
    test_get_value_four_fields_per_secret ... [OK]
  BaseTestCase
    runTest ... [OK]
  CollectionTestCase
    test_create_item ... ERROR:dbus.connection:Unable to set arguments ({'org.freedesktop.Secret.Collection.Label': dbus.String(u'sample_keyring', variant_level=1)}, '') according to signature u'a{sv}': <type 'exceptions.TypeError'>: Fewer items found in D-Bus signature than in Python arguments
                                                  [OK]
    test_create_item_prompt ... ERROR:dbus.connection:Unable to set arguments ({'org.freedesktop.Secret.Collection.Label': dbus.String(u'sample_keyring', variant_level=1)}, '') according to signature u'a{sv}': <type 'exceptions.TypeError'>: Fewer items found in D-Bus signature than in Python arguments
                                           [OK]
    test_create_item_prompt_dismissed ... ERROR:dbus.connection:Unable to set arguments ({'org.freedesktop.Secret.Collection.Label': dbus.String(u'sample_keyring', variant_level=1)}, '') according to signature u'a{sv}': <type 'exceptions.TypeError'>: Fewer items found in D-Bus signature than in Python arguments
                                 [OK]
    test_create_item_throws_dbus_er...

[lp:~ralsina/ubuntu-sso-client/fix_805405]

747. By Roberto Alsina on 2011-07-06

Lint notice

=== modified file 'pylintrc'
--- pylintrc	2011-04-12 14:45:36 +0000
+++ pylintrc	2011-07-06 17:12:36 +0000
@@ -58,7 +58,7 @@
 
 # Set the output format. Available formats are text, parseable, colorized, msvs
 # (visual studio) and html
-output-format=colorized
+output-format=text
 
 # Include message's id in output
 include-ids=yes
 
=== modified file 'ubuntu_sso/gtk/gui.py'
--- ubuntu_sso/gtk/gui.py	2011-03-30 18:50:04 +0000
+++ ubuntu_sso/gtk/gui.py	2011-07-06 17:12:36 +0000
@@ -1027,7 +1027,7 @@
 
     @log_call
     def on_user_registration_error(self, app_name, error, *args, **kwargs):
-        """Captcha image generation failed."""
+        """Error in the data provided for registration."""
         msg = error.get('email')
         if msg is not None:
             self.email1_entry.set_warning(msg)
 
=== modified file 'ubuntu_sso/qt/controllers.py'
--- ubuntu_sso/qt/controllers.py	2011-07-04 22:27:08 +0000
+++ ubuntu_sso/qt/controllers.py	2011-07-06 17:12:36 +0000
@@ -200,7 +200,7 @@
         logger.error('Got error when login %s, error: %s',
                      self.view.wizard().app_name, error)
         self.message_box.critical(self.view, self.view.wizard().app_name,
-                                  str(error))
+                                  error['message'])
 
     def on_logged_in(self, app_name, result):
         """We managed to log in."""
@@ -353,8 +353,13 @@
     def on_user_registration_error(self, app_name, error):
         """Let the user know we could not register."""
         logger.debug('SetUpAccountController.on_user_registration_error')
-        # error are returned as a dict with the data we want to show.
-        self.message_box.critical(self.view, error['errtype'], error['email'])
+        # errors are returned as a dict with the data we want to show.
+        self._refresh_captcha()
+        errors = [v for _, v in sorted(error.iteritems())]
+        self.message_box.critical(
+            self.view,
+            self.view.wizard().app_name,
+            '\n'.join(errors))
 
     def on_user_registered(self, app_name, result):
         """Execute when the user did register."""
 
=== modified file 'ubuntu_sso/qt/tests/test_windows.py'
--- ubuntu_sso/qt/tests/test_windows.py	2011-07-04 22:27:08 +0000
+++ ubuntu_sso/qt/tests/test_windows.py	2011-07-06 17:12:36 +0000
@@ -16,6 +16,8 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Test the ui controllers."""
 
+from twisted.trial.unittest import TestCase
+
 from mocker import ANY, MATCH, MockerTestCase
 
 from PyQt4.QtGui import QWizard
@@ -389,6 +391,78 @@
         self.controller._set_line_edits_validations()
 
 
+class FakeMessageBox(object):
+
+    """A fake message box."""
+
+    args = None
+    critical_args = None
+
+    def __init__(self, *args, **kwargs):
+        self.args = (args, kwargs)
+
+    def critical(self, *args, **kwargs):
+        """Fake critical popup."""
+        self.critical_args = (args, kwargs)
+
+
+class FakeView(object):
+
+    """A fake view"""
+
+    app_name = "TestApp"
+
+    def wizard(self):
+        """Use itself as a fake wizard, too."""
+        return self
+
+
+class SetupAccountControllerTest2(TestCase):
+
+    """Tests for SetupAccountController, but without Mocker"""
+
+    def setUp(self):
+        super(SetupAccountControllerTest2, self).setUp()
+        self.message_box = FakeMessageBox()
+        self.controller = SetUpAccountController(message_box=self.message_box)
+        self.patch(self.controller, '_refresh_captcha', self._set_called)
+        self.patch(self.controller, 'view', FakeView())
+        self._called = False
+
+    def _set_called(self, *args, **kwargs):
+        """Store 'args' and 'kwargs' for test assertions."""
+        self._called = (args, kwargs)
+
+    def test_on_user_registration_refresh_captcha(self):
+        """If there is a user reg. error, captcha should refresh."""
+        self.controller.on_user_registration_error('TestApp', {})
+        self.assertEqual(self._called, ((), {}))
+
+    def test_on_user_registration_all_only(self):
+        """Pass only a __all__ error key."""
+        self.controller.on_user_registration_error('TestApp',
+            {'__all__': "Error in All"})
+        self.assertEqual(self.message_box.critical_args, ((
+            self.controller.view,
+            self.controller.view.app_name,
+            "Error in All"), {}))
+
+    def test_on_user_registration_all_fields(self):
+        """Pass all known error keys, plus unknown one."""
+        self.controller.on_user_registration_error('TestApp',
+            {'__all__': "Error in All",
+             'email': "Error in email",
+             'pasword': "Error in password",
+             'unknownfield': "Error in unknown",
+            })
+        self.assertEqual(self.message_box.critical_args, ((
+            self.controller.view,
+            self.controller.view.app_name,
+            "Error in All\nError in email\n"
+            "Error in password\nError in unknown",
+            ), {}))
+
+
 class TosControllerTestCase(MockerTestCase):
     """Test the tos controller."""