Merge lp:~diegosarmentero/ubuntu-sso-client/handle-errors into lp:ubuntu-sso-client

[Diego Sarmentero]

- Adding a general error message when the argument received by build_general_error_message is not a dict (LP: #865176).

[lp:~diegosarmentero/ubuntu-sso-client/handle-errors]

913. By Diego Sarmentero on 2012-03-15

Removing new string.

914. By Diego Sarmentero on 2012-03-15

Fixing import order

[Natalia Bidart (nataliabidart)]

Looks great!

review: Approve

[dobey (dobey)]

review: Approve

=== modified file 'ubuntu_sso/qt/__init__.py'
--- ubuntu_sso/qt/__init__.py	2012-03-14 12:45:03 +0000
+++ ubuntu_sso/qt/__init__.py	2012-03-15 20:27:20 +0000
@@ -21,6 +21,7 @@
 from PyQt4 import QtGui, QtCore
 
 from ubuntu_sso.logger import setup_gui_logging
+from ubuntu_sso.utils.ui import GENERIC_BACKEND_ERROR
 
 logger = setup_gui_logging('ubuntu_sso.qt')
 
@@ -57,7 +58,9 @@
             result = '\n'.join(
                 [('%s: %s' % (k, v)) for k, v in errordict.iteritems()])
     else:
-        result = repr(errordict)
+        result = GENERIC_BACKEND_ERROR
+        logger.error('build_general_error_message with unknown error: %r',
+            errordict)
 
     logger.info('build_general_error_message: returning %r.', result)
     return result

=== modified file 'ubuntu_sso/qt/tests/test_common.py'
--- ubuntu_sso/qt/tests/test_common.py	2012-03-13 03:15:19 +0000
+++ ubuntu_sso/qt/tests/test_common.py	2012-03-15 20:27:20 +0000
@@ -20,7 +20,11 @@
 from twisted.internet import defer
 from twisted.trial.unittest import TestCase
 
-from ubuntu_sso.qt import maybe_elide_text
+from ubuntu_sso.qt import (
+    build_general_error_message,
+    maybe_elide_text,
+    GENERIC_BACKEND_ERROR,
+)
 from ubuntu_sso.qt.common import (
     check_as_invalid,
     check_as_valid,
@@ -281,3 +285,80 @@
         expected = unicode(self.ui.text())
         self.assertTrue(expected.endswith(u'\u2026'))
         self.assertTrue(text.startswith(expected[:-1]))
+
+
+class BuildGeneralErrorMessageTestCase(TestCase):
+    """Test passwords conditions."""
+
+    def test_with_message(self):
+        """Test build_general_error_message with 'message' key."""
+        error = "error message"
+        err_dict = {'message': error}
+
+        result = build_general_error_message(err_dict)
+
+        self.assertEqual(result, error)
+
+    def test_with_all(self):
+        """Test build_general_error_message with 'all' key."""
+        error = "error message"
+        err_dict = {'__all__': error}
+
+        result = build_general_error_message(err_dict)
+
+        self.assertEqual(result, error)
+
+    def test_with_message_and_all(self):
+        """Test build_general_error_message with 'all' and 'message' key."""
+        error = "error message"
+        error2 = "error message2"
+        err_dict = {'__all__': error, 'message': error2}
+
+        result = build_general_error_message(err_dict)
+
+        expected = '\n'.join((error, error2))
+        self.assertEqual(result, expected)
+
+    def test_with_all_and_error_message(self):
+        """Test for 'all' and 'error_message' key."""
+        error = "error message"
+        error2 = "error message2"
+        err_dict = {'__all__': error, 'error_message': error2}
+        result = build_general_error_message(err_dict)
+        expected = '\n'.join((error, error2))
+        self.assertEqual(result, expected)
+
+    def test_with_random_keys(self):
+        """Test build_general_error_message with random keys."""
+        error = "error message"
+        error2 = "error message2"
+        err_dict = {'my_bad': error, 'odd_error': error2}
+
+        result = build_general_error_message(err_dict)
+
+        expected = '\n'.join(
+            [('%s: %s' % (k, v)) for k, v in err_dict.iteritems()])
+        self.assertEqual(result, expected)
+
+    def test_with_random_keys_with_errtype(self):
+        """Test build_general_error_message with random keys and errtype."""
+        error = "error message"
+        error2 = "error message2"
+        err_dict = {'my_bad': error, 'odd_error': error2, 'errtype': 'Danger'}
+
+        result = build_general_error_message(err_dict)
+
+        expected = '\n'.join(
+            [('%s: %s' % (k, v)) \
+            for k, v in {'my_bad': error, 'odd_error': error2}.iteritems()])
+        self.assertEqual(result, expected)
+
+    def test_with_not_dict(self):
+        """Test build_general_error_message with argument not dict."""
+        error = "error message"
+        err_dict = Exception(error)
+
+        result = build_general_error_message(err_dict)
+
+        expected = GENERIC_BACKEND_ERROR
+        self.assertEqual(result, expected)