Merge lp:~nataliabidart/ubuntu/maverick/ubuntu-sso-client/ubuntu-sso-client-0.99.3 into lp:ubuntu/maverick/ubuntu-sso-client

[Natalia Bidart]

Release 0.99.3 (Bug fixes for UI freeze).

=== modified file 'MANIFEST.in'
--- MANIFEST.in	2010-08-24 15:47:58 +0000
+++ MANIFEST.in	2010-08-26 12:56:23 +0000
@@ -1,6 +1,7 @@
 include MANIFEST.in
 include COPYING README
 include run-tests
+recursive-include po *
 recursive-include bin *
 recursive-include data *
 recursive-include ubuntu_sso *.py

=== modified file 'PKG-INFO'
--- PKG-INFO	2010-08-24 15:47:58 +0000
+++ PKG-INFO	2010-08-26 12:56:23 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: ubuntu-sso-client
-Version: 0.99.2
+Version: 0.99.3
 Summary: Ubuntu Single Sign-On client
 Home-page: https://launchpad.net/ubuntu-sso-client
 Author: Natalia Bidart

=== removed file 'data/email.png'
Binary files data/email.png	2010-08-12 00:00:08 +0000 and data/email.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'data/ui.glade'
--- data/ui.glade	2010-08-24 15:47:58 +0000
+++ data/ui.glade	2010-08-26 12:56:23 +0000
@@ -4,6 +4,7 @@
   <!-- interface-naming-policy project-wide -->
   <object class="GtkWindow" id="window">
     <property name="border_width">20</property>
+    <property name="resizable">False</property>
     <property name="window_position">center</property>
     <signal name="delete_event" handler="on_close_clicked"/>
     <child>
@@ -59,19 +60,6 @@
     <property name="visible">True</property>
     <property name="spacing">10</property>
     <child>
-      <placeholder/>
-    </child>
-    <child>
-      <object class="GtkLabel" id="name_warning_label">
-        <property name="visible">True</property>
-        <property name="wrap">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">1</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkHBox" id="emails_hbox">
         <property name="visible">True</property>
         <property name="spacing">5</property>
@@ -89,14 +77,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="email_warning_label">
-        <property name="visible">True</property>
-        <property name="wrap">True</property>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="position">3</property>
-      </packing>
+      <placeholder/>
     </child>
     <child>
       <object class="GtkHBox" id="passwords_hbox">
@@ -126,63 +107,102 @@
       </packing>
     </child>
     <child>
-      <object class="GtkLabel" id="password_warning_label">
-        <property name="visible">True</property>
-        <property name="wrap">True</property>
-      </object>
-      <packing>
-        <property name="position">6</property>
-      </packing>
-    </child>
-    <child>
       <placeholder/>
     </child>
     <child>
-      <object class="GtkEventBox" id="captcha_loading">
-        <property name="width_request">300</property>
-        <property name="height_request">60</property>
-        <property name="visible">True</property>
-        <child>
-          <placeholder/>
-        </child>
-      </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">False</property>
+      <object class="GtkHBox" id="hbox1">
+        <property name="visible">True</property>
+        <child>
+          <object class="GtkVBox" id="captcha_vbox">
+            <property name="visible">True</property>
+            <property name="homogeneous">True</property>
+            <child>
+              <object class="GtkEventBox" id="captcha_loading">
+                <property name="width_request">300</property>
+                <property name="height_request">60</property>
+                <property name="visible">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkImage" id="captcha_image">
+                <property name="width_request">300</property>
+                <property name="height_request">60</property>
+                <property name="visible">True</property>
+                <property name="stock">gtk-missing-image</property>
+              </object>
+              <packing>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkVBox" id="vbox1">
+            <property name="visible">True</property>
+            <child>
+              <object class="GtkButton" id="captcha_reload_button">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="relief">none</property>
+                <property name="focus_on_click">False</property>
+                <signal name="clicked" handler="on_captcha_reload_button_clicked"/>
+                <child>
+                  <object class="GtkImage" id="image1">
+                    <property name="visible">True</property>
+                    <property name="icon_name">reload</property>
+                  </object>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+      <packing>
+        <property name="position">7</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkVBox" id="captcha_solution_vbox">
+        <property name="visible">True</property>
+        <property name="spacing">10</property>
+        <child>
+          <placeholder/>
+        </child>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
+      <packing>
         <property name="position">8</property>
       </packing>
     </child>
     <child>
-      <object class="GtkImage" id="captcha_image">
-        <property name="visible">True</property>
-        <property name="stock">gtk-missing-image</property>
-      </object>
-      <packing>
-        <property name="position">9</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkVBox" id="captcha_solution_vbox">
-        <property name="visible">True</property>
-        <property name="spacing">10</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child>
-          <object class="GtkLabel" id="captcha_solution_warning_label">
-            <property name="visible">True</property>
-            <property name="wrap">True</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-      </object>
-      <packing>
-        <property name="position">10</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkCheckButton" id="yes_to_updates_checkbutton">
         <property name="label" translatable="yes">yes to updates</property>
         <property name="visible">True</property>
@@ -193,11 +213,11 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="position">11</property>
+        <property name="position">9</property>
       </packing>
     </child>
     <child>
-      <object class="GtkHBox" id="hbox1">
+      <object class="GtkHBox" id="tc_hbox">
         <property name="visible">True</property>
         <child>
           <object class="GtkCheckButton" id="yes_to_tc_checkbutton">
@@ -231,7 +251,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="position">12</property>
+        <property name="position">10</property>
       </packing>
     </child>
     <child>
@@ -240,7 +260,7 @@
         <property name="wrap">True</property>
       </object>
       <packing>
-        <property name="position">13</property>
+        <property name="position">11</property>
       </packing>
     </child>
     <child>
@@ -280,7 +300,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="position">14</property>
+        <property name="position">12</property>
       </packing>
     </child>
     <child>
@@ -295,9 +315,12 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="position">15</property>
+        <property name="position">13</property>
       </packing>
     </child>
+    <child>
+      <placeholder/>
+    </child>
   </object>
   <object class="GtkVBox" id="processing_vbox">
     <property name="visible">True</property>
@@ -310,15 +333,6 @@
     <property name="visible">True</property>
     <property name="spacing">10</property>
     <child>
-      <object class="GtkImage" id="verify_email_image">
-        <property name="visible">True</property>
-        <property name="stock">gtk-missing-image</property>
-      </object>
-      <packing>
-        <property name="position">0</property>
-      </packing>
-    </child>
-    <child>
       <placeholder/>
     </child>
     <child>
@@ -344,7 +358,7 @@
       </object>
       <packing>
         <property name="expand">False</property>
-        <property name="position">2</property>
+        <property name="position">1</property>
       </packing>
     </child>
   </object>
@@ -359,6 +373,7 @@
         <property name="border_width">10</property>
         <property name="hscrollbar_policy">never</property>
         <property name="vscrollbar_policy">automatic</property>
+        <property name="shadow_type">in</property>
         <child>
           <placeholder/>
         </child>
@@ -412,24 +427,6 @@
               <placeholder/>
             </child>
             <child>
-              <object class="GtkLabel" id="login_email_warning_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">label</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkLabel" id="login_password_warning_label">
-                <property name="visible">True</property>
-                <property name="label" translatable="yes">label</property>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child>
               <object class="GtkLinkButton" id="forgotten_password_button">
                 <property name="label" translatable="yes">button</property>
                 <property name="visible">True</property>
@@ -440,7 +437,7 @@
                 <signal name="clicked" handler="on_forgotten_password_button_clicked"/>
               </object>
               <packing>
-                <property name="position">5</property>
+                <property name="position">2</property>
               </packing>
             </child>
           </object>

=== modified file 'debian/changelog'
--- debian/changelog	2010-08-24 20:30:45 +0000
+++ debian/changelog	2010-08-26 12:56:23 +0000
@@ -1,3 +1,35 @@
+ubuntu-sso-client (0.99.3-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release:
+
+  [ [e-mail] ]
+   * changed the "reset password" header and help text (LP: #622991).
+   * changed the "verify" header and help text, and removed the email image
+     (LP: #622988, LP: #622830).
+
+  [ [e-mail] ]
+    * added a reload button for the captcha (LP: #616459).
+
+  [ [e-mail] ]
+    * Warnings for entries are shown as secondary icons (LP: #624336).
+
+  [ [e-mail] ]
+    * Main window can not be maximized (LP: #624101).
+
+  [ [e-mail] ]
+    * Pinging the U1 url is done before sending any credential signal. Also,
+    ping is signed with user credentials (LP: #624034).
+
+  [ [e-mail] ]
+    * Put a border around the webkit box (LP: #624240).
+    * Hide the T&C link of no T&C url is provided (LP: #624241).
+    * Hide the help text on the T&C page (LP: #624242).
+
+  [ Alejandro J. Cura <[e-mail]> ]
+    * Turn exceptions into a dictionary able to go thru DBus (LP: #624018)
+
+ -- Natalia Bidart (nessita) <[e-mail]>  Wed, 25 Aug 2010 22:07:42 -0300
+
 ubuntu-sso-client (0.99.2-0ubuntu1) maverick; urgency=low
 
   * New upstream release:

=== added directory 'po'
=== added file 'po/POTFILES.in'
--- po/POTFILES.in	1970-01-01 00:00:00 +0000
+++ po/POTFILES.in	2010-08-26 12:56:23 +0000
@@ -0,0 +1,1 @@
+ubuntu_sso/gui.py

=== modified file 'run-tests'
--- run-tests	2010-08-19 16:02:09 +0000
+++ run-tests	2010-08-26 12:56:23 +0000
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-`which xvfb-run` ./contrib/test $@
+`which xvfb-run` ./contrib/test "$@"
 pyflakes bin ubuntu_sso
 if [ -x `which pep8` ]; then
     pep8 --repeat bin/ contrib/ \

=== modified file 'setup.py'
--- setup.py	2010-08-24 15:47:58 +0000
+++ setup.py	2010-08-26 12:56:23 +0000
@@ -81,7 +81,7 @@
 
 DistUtilsExtra.auto.setup(
     name='ubuntu-sso-client',
-    version='0.99.2',
+    version='0.99.3',
     license='GPL v3',
     author='Natalia Bidart',
     author_email='[e-mail]',
@@ -93,7 +93,7 @@
     data_files=[
         ('share/dbus-1/services', ['data/com.ubuntu.sso.service',]),
         ('lib/ubuntu-sso-client', ['bin/ubuntu-sso-login',]),
-        ('share/ubuntu-sso-client/data', ['data/ui.glade', 'data/email.png',]),
+        ('share/ubuntu-sso-client/data', ['data/ui.glade',]),
         ('/etc/xdg/ubuntu-sso/', ['data/oauth_urls',]),
         ('/etc/xdg/ubuntu-sso/oauth_registration.d',
          ['data/oauth_registration.d/ubuntuone',]),

=== modified file 'ubuntu_sso/gui.py'
--- ubuntu_sso/gui.py	2010-08-24 15:47:58 +0000
+++ ubuntu_sso/gui.py	2010-08-26 12:56:23 +0000
@@ -120,7 +120,7 @@
     def __init__(self, label, is_password=False, *args, **kwargs):
         self.label = label
         self.is_password = is_password
-        self._user_input = None
+        self.warning = None
 
         super(LabeledEntry, self).__init__(*args, **kwargs)
 
@@ -129,6 +129,7 @@
         self.set_tooltip_text(self.label)
         self.connect('focus-in-event', self._clear_text)
         self.connect('focus-out-event', self._set_label)
+        self.clear_warning()
         self.show()
 
     def _clear_text(self, *args, **kwargs):
@@ -162,6 +163,20 @@
             result = ''
         return result
 
+    def set_warning(self, warning_msg):
+        """Display warning as secondary icon, set 'warning_msg' as tooltip."""
+        self.warning = warning_msg
+        self.set_property('secondary-icon-stock', gtk.STOCK_DIALOG_WARNING)
+        self.set_property('secondary-icon-sensitive', True)
+        self.set_property('secondary-icon-tooltip-text', warning_msg)
+
+    def clear_warning(self):
+        """Remove any warning."""
+        self.warning = None
+        self.set_property('secondary-icon-stock', None)
+        self.set_property('secondary-icon-sensitive', False)
+        self.set_property('secondary-icon-tooltip-text', None)
+
 
 class UbuntuSSOClientGUI(object):
     """Ubuntu single sign on GUI."""
@@ -194,9 +209,9 @@
     PASSWORD_MISMATCH = _('The passwords don\'t match, please double check ' \
                           'and try entering them again.')
     PASSWORD_TOO_WEAK = _('The password is too weak.')
-    REQUEST_PASSWORD_TOKEN_LABEL = _('To reset your password enter your ' \
-                                     'email address below:')
-    RESET_PASSWORD = _('Reset Password')
+    REQUEST_PASSWORD_TOKEN_LABEL = _('To reset your %(app_name)s password,'
+                                     ' enter your email address below:')
+    RESET_PASSWORD = _('Reset password')
     RESET_CODE_ENTRY = _('Reset code')
     RESET_EMAIL_ENTRY = _('Email address')
     SET_NEW_PASSWORD_LABEL = _('A password reset code has been sent to ' \
@@ -208,12 +223,15 @@
                         'required to subscribe.')
     UNKNOWN_ERROR = _('There was an error when trying to complete the ' \
                       'process. Please check the information and try again.')
-    VERIFY_EMAIL_LABEL = _('Enter verification code.\n\nA verification code ' \
-                           'has just been sent to your email address.\n' \
-                           'Please enter your code from the email. ' \
-                           'An example is shown below.')
+    VERIFY_EMAIL_LABEL = ('<b>%s</b>\n\n' % _('Enter verification code') +
+                          _('Check %(email)s for an email from'
+                            ' Ubuntu Single Sign On.'
+                            ' This message contains a verification code.'
+                            ' Enter the code in the field below and click OK'
+                            ' to complete creating your %(app_name)s account'))
     YES_TO_TC = _('I agree with the %(app_name)s ')  # Terms&Conditions button
     YES_TO_UPDATES = _('Yes! Email me %(app_name)s tips and updates.')
+    CAPTCHA_RELOAD_TOOLTIP = _('Reload')
 
     def __init__(self, app_name, tc_uri, help_text,
                  window_id=0, login_only=False, close_callback=None):
@@ -274,6 +292,7 @@
             assert getattr(self, name) is not None
 
         self.window.set_icon_name('ubuntu-logo')
+        self.captcha_reload_button.set_tooltip_text(self.CAPTCHA_RELOAD_TOOLTIP)
 
         self.bus = dbus.SessionBus()
         self.bus.add_signal_receiver = self._log(self.bus.add_signal_receiver)
@@ -397,6 +416,8 @@
         for widget in self.warnings:
             widget.set_text('')
             widget.hide()
+        for widget in self.entries:
+            getattr(self, widget).clear_warning()
 
     def _non_empty_input(self, widget):
         """Return weather widget has non empty content."""
@@ -434,6 +455,14 @@
             else:
                 page.hide()
 
+    def _generate_captcha(self):
+        """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.backend.generate_captcha(self.app_name, self._captcha_filename,
+                                      reply_handler=NO_OP, error_handler=NO_OP)
+        self._set_captcha_loading()
+
     def _set_captcha_loading(self):
         """Present a spinner to the user while the captcha is downloaded."""
         self.captcha_image.hide()
@@ -472,27 +501,25 @@
         self.password_help_label.set_markup(help_msg)
 
         if not os.path.exists(self._captcha_filename):
-            self._set_captcha_loading()
+            self._generate_captcha()
         else:
             self._set_captcha_image()
 
         msg = self.YES_TO_UPDATES % {'app_name': self.app_name}
         self.yes_to_updates_checkbutton.set_label(msg)
-        msg = self.YES_TO_TC % {'app_name': self.app_name}
-        self.yes_to_tc_checkbutton.set_label(msg)
-        self.tc_button.set_label(self.TC)
+        if self.tc_uri:
+            msg = self.YES_TO_TC % {'app_name': self.app_name}
+            self.yes_to_tc_checkbutton.set_label(msg)
+            self.tc_button.set_label(self.TC)
+        else:
+            self.tc_hbox.hide_all()
         self.login_button.set_label(self.LOGIN_BUTTON_LABEL)
 
-        logger.info('Calling generate_captcha with filename path at %r',
-                    self._captcha_filename)
-        f = self.backend.generate_captcha
-        f(self.app_name, self._captcha_filename,
-          reply_handler=NO_OP, error_handler=NO_OP)
-
         return self.enter_details_vbox
 
     def _build_tc_page(self):
         """Build the Terms & Conditions page."""
+        self.tc_browser_vbox.help_text = ''
         return self.tc_browser_vbox
 
     def _build_processing_page(self):
@@ -503,13 +530,8 @@
 
     def _build_verify_email_page(self):
         """Build the verify email page."""
-        self.verify_email_vbox.help_text = self.VERIFY_EMAIL_LABEL
         self.verify_email_vbox.pack_start(self.email_token_entry, expand=False)
-        self.verify_email_vbox.reorder_child(self.email_token_entry, 1)
-
-        fname = get_data_file('email.png')
-        self._email_example_pixbuf = gtk.gdk.pixbuf_new_from_file(fname)
-        self.verify_email_image.set_from_pixbuf(self._email_example_pixbuf)
+        self.verify_email_vbox.reorder_child(self.email_token_entry, 0)
 
         return self.verify_email_vbox
 
@@ -529,7 +551,7 @@
         self.login_details_vbox.pack_start(self.login_email_entry)
         self.login_details_vbox.reorder_child(self.login_email_entry, 0)
         self.login_details_vbox.pack_start(self.login_password_entry)
-        self.login_details_vbox.reorder_child(self.login_password_entry, 2)
+        self.login_details_vbox.reorder_child(self.login_password_entry, 1)
 
         msg = self.FORGOTTEN_PASSWORD_BUTTON
         self.forgotten_password_button.set_label(msg)
@@ -540,7 +562,7 @@
     def _build_request_password_token_page(self):
         """Build the login page."""
         self.request_password_token_vbox.header = self.RESET_PASSWORD
-        text = self.REQUEST_PASSWORD_TOKEN_LABEL
+        text = self.REQUEST_PASSWORD_TOKEN_LABEL % {'app_name': self.app_label}
         self.request_password_token_vbox.help_text = text
 
         entry = self.reset_email_entry
@@ -624,41 +646,40 @@
 
         name = self.name_entry.get_text()
         if not name:
-            self._set_warning_message(self.name_warning_label,
-                                      self.FIELD_REQUIRED)
+            self.name_entry.set_warning(self.FIELD_REQUIRED)
             error |= True
 
         # check email
         email1 = self.email1_entry.get_text()
         email2 = self.email2_entry.get_text()
         if email1 != email2:
-            self._set_warning_message(self.email_warning_label,
-                                      self.EMAIL_MISMATCH)
+            self.email1_entry.set_warning(self.EMAIL_MISMATCH)
+            self.email2_entry.set_warning(self.EMAIL_MISMATCH)
             error |= True
 
         if '@' not in email1:
-            self._set_warning_message(self.email_warning_label,
-                                      self.EMAIL_INVALID)
+            self.email1_entry.set_warning(self.EMAIL_INVALID)
+            self.email2_entry.set_warning(self.EMAIL_INVALID)
             error |= True
 
         if not email1:
-            self._set_warning_message(self.email_warning_label,
-                                      self.FIELD_REQUIRED)
+            self.email1_entry.set_warning(self.FIELD_REQUIRED)
+            self.email2_entry.set_warning(self.FIELD_REQUIRED)
             error |= True
 
         # check password
         password1 = self.password1_entry.get_text()
         password2 = self.password2_entry.get_text()
         if password1 != password2:
-            self._set_warning_message(self.password_warning_label,
-                                      self.PASSWORD_MISMATCH)
+            self.password1_entry.set_warning(self.PASSWORD_MISMATCH)
+            self.password2_entry.set_warning(self.PASSWORD_MISMATCH)
             error |= True
 
         if (len(password1) < 8 or
             re.search('[A-Z]', password1) is None or
             re.search('\d+', password1) is None):
-            self._set_warning_message(self.password_warning_label,
-                                      self.PASSWORD_TOO_WEAK)
+            self.password1_entry.set_warning(self.PASSWORD_TOO_WEAK)
+            self.password2_entry.set_warning(self.PASSWORD_TOO_WEAK)
             error |= True
 
         # check T&C
@@ -669,8 +690,7 @@
 
         captcha_solution = self.captcha_solution_entry.get_text()
         if not captcha_solution:
-            self._set_warning_message(self.captcha_solution_warning_label,
-                                      self.FIELD_REQUIRED)
+            self.captcha_solution_entry.set_warning(self.FIELD_REQUIRED)
             error |= True
 
         if error:
@@ -717,20 +737,17 @@
         email = self.login_email_entry.get_text()
 
         if '@' not in email:
-            self._set_warning_message(self.login_email_warning_label,
-                                      self.EMAIL_INVALID)
+            self.login_email_entry.set_warning(self.EMAIL_INVALID)
             error |= True
 
         if not email:
-            self._set_warning_message(self.login_email_warning_label,
-                                      self.FIELD_REQUIRED)
+            self.login_email_entry.set_warning(self.FIELD_REQUIRED)
             error |= True
 
         password = self.login_password_entry.get_text()
 
         if not password:
-            self._set_warning_message(self.login_password_warning_label,
-                                      self.FIELD_REQUIRED)
+            self.login_password_entry.set_warning(self.FIELD_REQUIRED)
             error |= True
 
         if error:
@@ -813,6 +830,10 @@
             browser.destroy()
             del browser
 
+    def on_captcha_reload_button_clicked(self, *args, **kwargs):
+        """User clicked the reload captcha button."""
+        self._generate_captcha()
+
     # backend callbacks
 
     @log_call
@@ -829,6 +850,9 @@
     @log_call
     def on_user_registered(self, app_name, email, *args, **kwargs):
         """Registration can go on, user needs to verify email."""
+        help_text = self.VERIFY_EMAIL_LABEL % {'app_name': self.app_name,
+                                               'email': email}
+        self.verify_email_vbox.help_text = help_text
         self._set_current_page(self.verify_email_vbox)
 
     @log_call

=== modified file 'ubuntu_sso/main.py'
--- ubuntu_sso/main.py	2010-08-24 15:47:58 +0000
+++ ubuntu_sso/main.py	2010-08-26 12:56:23 +0000
@@ -44,7 +44,7 @@
 from lazr.restfulclient.authorize.oauth import OAuthAuthorizer
 from lazr.restfulclient.errors import HTTPError
 from lazr.restfulclient.resource import ServiceRoot
-from oauth.oauth import OAuthToken
+from oauth import oauth
 
 from ubuntu_sso import (DBUS_IFACE_AUTH_NAME, DBUS_IFACE_USER_NAME,
     DBUS_IFACE_CRED_NAME, DBUS_CRED_PATH, DBUS_BUS_NAME, gui)
@@ -59,7 +59,7 @@
 
 OLD_KEY_NAME = "UbuntuOne token for https://ubuntuone.com"
 U1_APP_NAME = "Ubuntu One"
-PING_URL = "http://one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
+PING_URL = "http://edge.one.ubuntu.com/oauth/sso-finished-so-get-tokens/"
 
 
 class NoDefaultConfigError(Exception):
@@ -235,7 +235,7 @@
         token = self.login(email=email, password=password,
                            token_name=token_name)
 
-        oauth_token = OAuthToken(token['token'], token['token_secret'])
+        oauth_token = oauth.OAuthToken(token['token'], token['token_secret'])
         authorizer = OAuthAuthorizer(token['consumer_key'],
                                      token['consumer_secret'],
                                      oauth_token)
@@ -289,10 +289,18 @@
 
 def except_to_errdict(e):
     """Turn an exception into a dictionary to return thru DBus."""
-    return {
-        "errtype": type(e).__name__,
-        "message": "\n".join(str(arg) for arg in e.args),
+    result = {
+        "errtype": e.__class__.__name__,
+        "errargs": repr(e.args),
     }
+    if len(e.args) == 0:
+        result["message"] = e.__class__.__doc__
+    elif isinstance(e.args[0], dict):
+        result.update(e.args[0])
+    elif isinstance(e.args[0], basestring):
+        result["message"] = e.args[0]
+
+    return result
 
 
 def blocking(f, app_name, result_cb, error_cb):
@@ -302,7 +310,7 @@
         try:
             result_cb(app_name, f())
         except Exception, e:
-            msg = "Exception while running DBus blocking code in a thread."""
+            msg = "Exception while running DBus blocking code in a thread:"
             logger.exception(msg)
             error_cb(app_name, except_to_errdict(e))
     threading.Thread(target=_in_thread).start()
@@ -479,6 +487,7 @@
         logger.info('Login successful for app %r, email %r', app_name, email)
         try:
             creds = keyring_get_credentials(app_name)
+            self._ping_url(app_name, email, creds)
             self.CredentialsFound(app_name, creds)
         except Exception:
             msg = "Problem getting the credentials from the keyring."
@@ -495,10 +504,26 @@
         """The user decides not to allow the registration or login."""
         self.AuthorizationDenied(app_name)
 
-    def _ping_url(self, dialog, app_name, email):
+    def _ping_url(self, app_name, email, credentials):
         """Ping the given url."""
+        logger.info('Maybe pinging url %s for app_name %r', PING_URL, app_name)
         if app_name == U1_APP_NAME:
-            urllib2.urlopen(PING_URL + email)
+            url = PING_URL + email
+            consumer = oauth.OAuthConsumer(credentials['consumer_key'],
+                                           credentials['consumer_secret'])
+            token = oauth.OAuthToken(credentials['token'],
+                                     credentials['token_secret'])
+            get_request = oauth.OAuthRequest.from_consumer_and_token
+            oauth_req = get_request(oauth_consumer=consumer, token=token,
+                                    http_method="GET", http_url=url)
+            oauth_req.sign_request(oauth.OAuthSignatureMethod_HMAC_SHA1(),
+                                   consumer, token)
+            request = urllib2.Request(url, headers=oauth_req.to_header())
+            logger.debug('Opening the ping url with urllib2.urlopen. ' \
+                         'Request to: %s', request.get_full_url())
+            response = urllib2.urlopen(request)
+            logger.debug('Url opened. Response: %s.', response.code)
+            return response.code
 
     def _show_login_or_register_ui(self, app_name, tc_url, help_text,
                                    win_id, login_only=False):
@@ -507,11 +532,9 @@
             gui_app = gui.UbuntuSSOClientGUI(app_name, tc_url,
                                              help_text, win_id, login_only)
             gui_app.connect(gui.SIG_LOGIN_SUCCEEDED, self._login_success_cb)
-            gui_app.connect(gui.SIG_LOGIN_SUCCEEDED, self._ping_url)
             gui_app.connect(gui.SIG_LOGIN_FAILED, self._login_error_cb)
             gui_app.connect(gui.SIG_REGISTRATION_SUCCEEDED,
                             self._login_success_cb)
-            gui_app.connect(gui.SIG_REGISTRATION_SUCCEEDED, self._ping_url)
             gui_app.connect(gui.SIG_REGISTRATION_FAILED, self._login_error_cb)
             gui_app.connect(gui.SIG_USER_CANCELATION,
                             self._login_auth_denied_cb)

=== modified file 'ubuntu_sso/tests/test_gui.py'
--- ubuntu_sso/tests/test_gui.py	2010-08-24 15:47:58 +0000
+++ ubuntu_sso/tests/test_gui.py	2010-08-26 12:56:23 +0000
@@ -262,6 +262,39 @@
         self.entry.set_text('a')
         self.assertEqual(self.entry.get_text(), 'a')
 
+    def test_no_warning_by_default(self):
+        """No secondary icon by default."""
+        self.assertEqual(self.entry.warning, None)
+        self.assertEqual(self.entry.get_property('secondary-icon-stock'),
+                         None)
+        self.assertEqual(self.entry.get_property('secondary-icon-sensitive'),
+                         False)
+        prop = self.entry.get_property('secondary-icon-tooltip-text')
+        self.assertEqual(prop, None)
+
+    def test_set_warning(self):
+        """Setting a warning show the proper secondary icon."""
+        msg = 'You failed!'
+        self.entry.set_warning(msg)
+        self.assertEqual(self.entry.warning, msg)
+        self.assertEqual(self.entry.get_property('secondary-icon-stock'),
+                         gtk.STOCK_DIALOG_WARNING)
+        self.assertEqual(self.entry.get_property('secondary-icon-sensitive'),
+                         True)
+        prop = self.entry.get_property('secondary-icon-tooltip-text')
+        self.assertEqual(prop, msg)
+
+    def test_clear_warning(self):
+        """Clearing a warning no longer show the secondary icon."""
+        self.entry.clear_warning()
+        self.assertEqual(self.entry.warning, None)
+        self.assertEqual(self.entry.get_property('secondary-icon-stock'),
+                         None)
+        self.assertEqual(self.entry.get_property('secondary-icon-sensitive'),
+                         False)
+        prop = self.entry.get_property('secondary-icon-tooltip-text')
+        self.assertEqual(prop, None)
+
 
 class PasswordLabeledEntryTestCase(LabeledEntryTestCase):
     """Test suite for the labeled entry when is_password is True."""
@@ -331,7 +364,7 @@
             self.assertEqual(visible, widget.get_property('visible'),
                              msg % (name, '' if visible else 'not '))
 
-    def assert_correct_warning(self, label, message):
+    def assert_correct_label_warning(self, label, message):
         """Check that a warning is shown displaying 'message'."""
         # warning label is visible
         self.assertTrue(label.get_property('visible'))
@@ -345,6 +378,10 @@
         actual = label.style.fg[gtk.STATE_NORMAL]
         self.assertEqual(expected, actual)  # until realized this will fail
 
+    def assert_correct_entry_warning(self, entry, message):
+        """Check that a warning is shown displaying 'message'."""
+        self.assertEqual(entry.warning, message)
+
     def assert_pages_visibility(self, **kwargs):
         """The pages has the correct visibility."""
         for i in self.pages:
@@ -418,6 +455,10 @@
         """The main window is shown at startup."""
         self.assertTrue(self.ui.window.get_property('visible'))
 
+    def test_main_window_is_not_resizable(self):
+        """The main window can not be resized."""
+        self.assertFalse(self.ui.window.get_property('resizable'))
+
     def test_closing_main_window_calls_close_callback(self):
         """The close_callback is called when closing the main window."""
         self.ui.close_callback = self._set_called
@@ -711,15 +752,47 @@
         self.assertTrue(self.ui.captcha_image.get_property('visible'))
         self.assertEqual(self._called, ((self.ui._captcha_filename,), {}))
 
+    def test_captcha_reload_button_visible(self):
+        """The captcha reload button is initially visible."""
+        self.assertTrue(self.ui.captcha_reload_button.get_visible(),
+                        "The captcha button is not visible")
+
+    def test_captcha_reload_button_reloads_captcha(self):
+        """The captcha reload button loads a new captcha."""
+        self.ui.on_captcha_generated(app_name=APP_NAME, captcha_id=CAPTCHA_ID)
+        self.patch(self.ui, '_generate_captcha', self._set_called)
+        self.ui.captcha_reload_button.clicked()
+        self.assertEqual(self._called, ((), {}))
+
+    def test_captcha_reload_button_has_tooltip(self):
+        """The captcha reload button has a tooltip."""
+        self.assertEqual(self.ui.captcha_reload_button.get_tooltip_text(),
+                         self.ui.CAPTCHA_RELOAD_TOOLTIP)
+
     def test_login_button_has_correct_wording(self):
         """The sign in button has the proper wording."""
         actual = self.ui.login_button.get_label()
         self.assertEqual(self.ui.LOGIN_BUTTON_LABEL, actual)
 
 
+class NoTermsAndConditionsTestCase(UbuntuSSOClientTestCase):
+    """Test suite for the user registration (with no t&c link)."""
+
+    kwargs = dict(app_name=APP_NAME, tc_uri='', help_text=HELP_TEXT)
+
+    def test_no_tc_link(self):
+        """The T&C button and checkbox are not shown if no link is provided"""
+        self.assertEqual(self.ui.tc_hbox.get_visible(), False)
+
+
 class TermsAndConditionsTestCase(UbuntuSSOClientTestCase):
     """Test suite for the user registration (terms & conditions page)."""
 
+    def test_has_tc_link(self):
+        """The T&C button and checkbox are shown if the link is provided"""
+        self.assertEqual(self.ui.tc_button.get_visible(), True)
+        self.assertEqual(self.ui.yes_to_tc_checkbutton.get_visible(), True)
+
     def test_tc_browser_is_created_when_tc_page_is_shown(self):
         """The webkit browser is created when the TC page is shown."""
         self.ui.tc_browser_vbox.show()
@@ -758,6 +831,11 @@
         """Terms & Conditions has the proper wording."""
         self.assertEqual(self.ui.tc_button.get_label(), self.ui.TC)
 
+    def test_tc_has_no_help_text(self):
+        """The help text is removed."""
+        self.ui.tc_button.clicked()
+        self.assertEqual('', self.ui.help_label.get_text())
+
     def test_tc_browser_opens_the_proper_uri(self):
         """Terms & Conditions browser shows the proper uri."""
         self.ui.tc_button.clicked()
@@ -780,8 +858,8 @@
 
     def test_warning_label_is_shown(self):
         """On UserRegistrationError the warning label is shown."""
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.UNKNOWN_ERROR)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.UNKNOWN_ERROR)
 
 
 class VerifyEmailTestCase(UbuntuSSOClientTestCase):
@@ -793,12 +871,6 @@
         self.ui.on_user_registered(app_name=APP_NAME, email=EMAIL)
         self.click_verify_email_with_valid_data()
 
-    def test_verify_email_image_is_correct(self):
-        """The email-example image is shown."""
-        pixbuf = self.ui.verify_email_image.get_pixbuf()
-        self.assertTrue(pixbuf is not None)
-        self.assertEqual(self.ui._email_example_pixbuf, pixbuf)
-
     def test_registration_successful_shows_verify_email_vbox(self):
         """Receiving 'registration_successful' shows the verify email vbox."""
         self.ui.on_user_registered(app_name=APP_NAME, email=EMAIL)
@@ -807,8 +879,9 @@
     def test_help_label_display_correct_wording(self):
         """The help_label display VERIFY_EMAIL_LABEL."""
         msg = 'help_label must read "%s" (got "%s" instead).'
-        actual = self.ui.help_label.get_text()
-        expected = self.ui.VERIFY_EMAIL_LABEL
+        actual = self.ui.help_label.get_label()
+        expected = self.ui.VERIFY_EMAIL_LABEL % {'app_name': APP_NAME,
+                                                 'email': EMAIL}
         self.assertEqual(expected, actual, msg % (expected, actual))
 
     def test_on_verify_token_button_clicked_calls_validate_email(self):
@@ -847,8 +920,8 @@
         """On email validation error, the verify_email page is shown."""
         self.ui.on_email_validation_error(app_name=APP_NAME, error=ERROR)
         self.assert_pages_visibility(verify_email=True)
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.UNKNOWN_ERROR)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.UNKNOWN_ERROR)
 
     def test_success_label_is_correct(self):
         """The success message is correct."""
@@ -871,8 +944,8 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.name_warning_label,
-                                    self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.name_entry,
+                                          self.ui.FIELD_REQUIRED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_empty_email(self):
@@ -882,8 +955,10 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.email_warning_label,
-                                    self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.email1_entry,
+                                          self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.email2_entry,
+                                          self.ui.FIELD_REQUIRED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_email_mismatch(self):
@@ -893,8 +968,10 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.email_warning_label,
-                                    self.ui.EMAIL_MISMATCH)
+        self.assert_correct_entry_warning(self.ui.email1_entry,
+                                          self.ui.EMAIL_MISMATCH)
+        self.assert_correct_entry_warning(self.ui.email2_entry,
+                                          self.ui.EMAIL_MISMATCH)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_invalid_email(self):
@@ -904,8 +981,10 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.email_warning_label,
-                                    self.ui.EMAIL_INVALID)
+        self.assert_correct_entry_warning(self.ui.email1_entry,
+                                          self.ui.EMAIL_INVALID)
+        self.assert_correct_entry_warning(self.ui.email2_entry,
+                                          self.ui.EMAIL_INVALID)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_password_help_is_always_shown(self):
@@ -923,8 +1002,10 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.password_warning_label,
-                                    self.ui.PASSWORD_MISMATCH)
+        self.assert_correct_entry_warning(self.ui.password1_entry,
+                                          self.ui.PASSWORD_MISMATCH)
+        self.assert_correct_entry_warning(self.ui.password2_entry,
+                                          self.ui.PASSWORD_MISMATCH)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_password_too_weak(self):
@@ -936,8 +1017,10 @@
 
             self.ui.join_ok_button.clicked()  # submit form
 
-            self.assert_correct_warning(self.ui.password_warning_label,
-                                        self.ui.PASSWORD_TOO_WEAK)
+            self.assert_correct_entry_warning(self.ui.password1_entry,
+                                              self.ui.PASSWORD_TOO_WEAK)
+            self.assert_correct_entry_warning(self.ui.password2_entry,
+                                              self.ui.PASSWORD_TOO_WEAK)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_tc_not_accepted(self):
@@ -947,8 +1030,8 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.tc_warning_label,
-                                    self.ui.TC_NOT_ACCEPTED)
+        self.assert_correct_label_warning(self.ui.tc_warning_label,
+                                          self.ui.TC_NOT_ACCEPTED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_warning_is_shown_if_not_captcha_solution(self):
@@ -958,8 +1041,8 @@
 
         self.ui.join_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.captcha_solution_warning_label,
-                                    self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.captcha_solution_entry,
+                                          self.ui.FIELD_REQUIRED)
         self.assertNotIn('register_user', self.ui.backend._called)
 
     def test_no_warning_messages_if_valid_data_on_enter_details(self):
@@ -1060,8 +1143,8 @@
         """On user login error, a warning is shown with proper wording."""
         self.click_connect_with_valid_data()
         self.ui.on_login_error(app_name=APP_NAME, error=ERROR)
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.UNKNOWN_ERROR)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.UNKNOWN_ERROR)
 
     def test_back_to_registration_hides_warning(self):
         """After user login error, warning is hidden when clicking 'Back'."""
@@ -1085,8 +1168,8 @@
 
         self.ui.login_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.login_email_warning_label,
-                                    self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.login_email_entry,
+                                          self.ui.FIELD_REQUIRED)
         self.assertNotIn('login', self.ui.backend._called)
 
     def test_warning_is_shown_if_invalid_email(self):
@@ -1095,8 +1178,8 @@
 
         self.ui.login_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.login_email_warning_label,
-                                    self.ui.EMAIL_INVALID)
+        self.assert_correct_entry_warning(self.ui.login_email_entry,
+                                          self.ui.EMAIL_INVALID)
         self.assertNotIn('login', self.ui.backend._called)
 
     def test_warning_is_shown_if_empty_password(self):
@@ -1105,8 +1188,8 @@
 
         self.ui.login_ok_button.clicked()  # submit form
 
-        self.assert_correct_warning(self.ui.login_password_warning_label,
-                                    self.ui.FIELD_REQUIRED)
+        self.assert_correct_entry_warning(self.ui.login_password_entry,
+                                          self.ui.FIELD_REQUIRED)
         self.assertNotIn('login', self.ui.backend._called)
 
     def test_no_warning_messages_if_valid_data(self):
@@ -1143,8 +1226,8 @@
 
     def test_on_forgotten_password_button_clicked_help_text(self):
         """Clicking forgotten_password_button the help is properly changed."""
-        self.assertEqual(self.ui.help_label.get_text(),
-                         self.ui.REQUEST_PASSWORD_TOKEN_LABEL)
+        wanted = self.ui.REQUEST_PASSWORD_TOKEN_LABEL % {'app_name': APP_NAME}
+        self.assertEqual(self.ui.help_label.get_text(), wanted)
 
     def test_on_forgotten_password_button_clicked_header_label(self):
         """Clicking forgotten_password_button the title is properly changed."""
@@ -1219,8 +1302,8 @@
     def test_on_password_reset_error_shows_login_page(self):
         """When reset token wasn't successfuly sent the login page is shown."""
         self.ui.on_password_reset_error(app_name=APP_NAME, error=ERROR)
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.UNKNOWN_ERROR)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.UNKNOWN_ERROR)
         self.assert_pages_visibility(login=True)
 
 
@@ -1269,15 +1352,15 @@
     def test_on_password_changed_shows_success_page(self):
         """When password was successfuly changed the success page is shown."""
         self.ui.on_password_changed(app_name=APP_NAME, email=EMAIL)
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.PASSWORD_CHANGED)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.PASSWORD_CHANGED)
         self.assert_pages_visibility(login=True)
 
     def test_on_password_change_error_shows_login_page(self):
         """When password wasn't changed the reset password page is shown."""
         self.ui.on_password_change_error(app_name=APP_NAME, error=ERROR)
-        self.assert_correct_warning(self.ui.warning_label,
-                                    self.ui.UNKNOWN_ERROR)
+        self.assert_correct_label_warning(self.ui.warning_label,
+                                          self.ui.UNKNOWN_ERROR)
         self.assert_pages_visibility(request_password_token=True)
 
 

=== modified file 'ubuntu_sso/tests/test_main.py'
--- ubuntu_sso/tests/test_main.py	2010-08-24 15:47:58 +0000
+++ ubuntu_sso/tests/test_main.py	2010-08-26 12:56:23 +0000
@@ -61,7 +61,7 @@
 RESET_PASSWORD_TOKEN = '8G5Wtq'
 TOKEN = {u'consumer_key': u'xQ7xDAz',
          u'consumer_secret': u'KzCJWCTNbbntwfyCKKjomJDzlgqxLy',
-         u'name': u'test',
+         u'token_name': u'test',
          u'token': u'GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo',
          u'token_secret': u'qFYImEtlczPbsCnYyuwLoPDlPEnvNcIktZphPQklAWrvyfFMV'}
 TOKEN_NAME = get_token_name(APP_NAME)
@@ -81,6 +81,14 @@
 LOGIN_ONLY_GUI_ARGS = (APP_NAME, None, HELP, WINDOW_ID, True)
 
 
+class FakedResponse(object):
+    """Fake a urlopen response."""
+
+    def __init__(self, *args, **kwargs):
+        for k, v in kwargs.iteritems():
+            setattr(self, k, v)
+
+
 class FakedCaptchas(object):
     """Fake the captcha generator."""
 
@@ -735,6 +743,60 @@
         return d
 
 
+class TestExceptToErrdictException(Exception):
+    """A dummy exception for the following testcase."""
+
+
+class ExceptToErrdictTestCase(TestCase):
+    """Tests for the except_to_errdict function."""
+
+    def test_first_arg_is_dict(self):
+        """If the first arg is a dict, use it as the base dict."""
+        sample_dict = {
+            "errorcode1": "error message 1",
+            "errorcode2": "error message 2",
+            "errorcode3": "error message 3",
+        }
+        e = TestExceptToErrdictException(sample_dict)
+        result = except_to_errdict(e)
+
+        self.assertEqual(result["errtype"], e.__class__.__name__)
+        for k in sample_dict.keys():
+            self.assertIn(k, result)
+            self.assertEqual(result[k], sample_dict[k])
+
+    def test_first_arg_is_str(self):
+        """If the first arg is a str, use it as the message."""
+        sample_string = "a sample string"
+        e = TestExceptToErrdictException(sample_string)
+        result = except_to_errdict(e)
+        self.assertEqual(result["errtype"], e.__class__.__name__)
+        self.assertEqual(result["message"], sample_string)
+
+    def test_first_arg_is_unicode(self):
+        """If the first arg is a unicode, use it as the message."""
+        sample_string = u"a sample string"
+        e = TestExceptToErrdictException(sample_string)
+        result = except_to_errdict(e)
+        self.assertEqual(result["errtype"], e.__class__.__name__)
+        self.assertEqual(result["message"], sample_string)
+
+    def test_no_args_at_all(self):
+        """If there are no args, use the class docstring."""
+        e = TestExceptToErrdictException()
+        result = except_to_errdict(e)
+        self.assertEqual(result["errtype"], e.__class__.__name__)
+        self.assertEqual(result["message"], e.__class__.__doc__)
+
+    def test_some_other_thing_as_first_arg(self):
+        """If first arg is not basestring nor dict, then repr all args."""
+        sample_args = (None, u"unicode2\ufffd", "errorcode3")
+        e = TestExceptToErrdictException(*sample_args)
+        result = except_to_errdict(e)
+        self.assertEqual(result["errtype"], e.__class__.__name__)
+        self.assertEqual(result["errargs"], repr(sample_args))
+
+
 class KeyringCredentialsTestCase(MockerTestCase):
     """Checks the functions that access the keyring."""
 
@@ -1163,10 +1225,8 @@
 
         expected = [
             (gui.SIG_LOGIN_SUCCEEDED, self.client._login_success_cb),
-            (gui.SIG_LOGIN_SUCCEEDED, self.client._ping_url),
             (gui.SIG_LOGIN_FAILED, self.client._login_error_cb),
             (gui.SIG_REGISTRATION_SUCCEEDED, self.client._login_success_cb),
-            (gui.SIG_REGISTRATION_SUCCEEDED, self.client._ping_url),
             (gui.SIG_REGISTRATION_FAILED, self.client._login_error_cb),
             (gui.SIG_USER_CANCELATION, self.client._login_auth_denied_cb),
         ]
@@ -1225,10 +1285,8 @@
 
         expected = [
             (gui.SIG_LOGIN_SUCCEEDED, self.client._login_success_cb),
-            (gui.SIG_LOGIN_SUCCEEDED, self.client._ping_url),
             (gui.SIG_LOGIN_FAILED, self.client._login_error_cb),
             (gui.SIG_REGISTRATION_SUCCEEDED, self.client._login_success_cb),
-            (gui.SIG_REGISTRATION_SUCCEEDED, self.client._ping_url),
             (gui.SIG_REGISTRATION_FAILED, self.client._login_error_cb),
             (gui.SIG_USER_CANCELATION, self.client._login_auth_denied_cb),
         ]
@@ -1236,36 +1294,95 @@
         self.login_only(*LOGIN_ONLY_ARGS)
         self.assertEqual(self.signals, expected)
 
+
+class PingServerTestCase(TestCase):
+    """On successful login/registration, the U1 server is pinged."""
+
+    def setUp(self):
+        """Init."""
+        self.patch(ubuntu_sso.main, 'keyring_get_credentials', lambda a: TOKEN)
+        self.calls = []
+        self.args = None
+        self.kwargs = None
+
+        def fake_it(*args, **kwargs):
+            """Fake a call."""
+            self.args = args
+            self.kwargs = kwargs
+            return FakedResponse(code=200)
+
+        self.patch(urllib2, 'urlopen', fake_it)
+
+        self.client = SSOCredentials(None)
+
+        self.memento = MementoHandler()
+        self.memento.setLevel(logging.DEBUG)
+        logger.addHandler(self.memento)
+
+    def _patch(self, name):
+        """Patch a method so when it's called its name is stored."""
+        self.patch(self.client, name,
+                   lambda *a, **kw: self.calls.append((name, a, kw)))
+
     def test_on_registration_successful_u1_server_is_pinged(self):
         """When a registration is successful, the PING_URL is pinged."""
-        self.args = None
-        self.kwargs = None
-
-        def fake_it(*args, **kwargs):
-            """Fake a call."""
-            self.args = args
-            self.kwargs = kwargs
-
-        self.patch(urllib2, 'urlopen', fake_it)
-
-        self.client._ping_url(None, U1_APP_NAME, EMAIL)
-
-        self.assertEqual(self.args, (PING_URL + EMAIL,))
+        self.client._login_success_cb(None, U1_APP_NAME, EMAIL)
+
+        self.assertEqual(len(self.args), 1)
+        self.assertEqual(self.args[0].get_full_url(), PING_URL + EMAIL)
         self.assertEqual(self.kwargs, {})
 
     def test_on_registration_successful_no_server_is_pinged(self):
         """When a registration is successful, the PING_URL is not pinged."""
-        self.args = None
-        self.kwargs = None
-
-        def fake_it(*args, **kwargs):
-            """Fake a call."""
-            self.args = args
-            self.kwargs = kwargs
-
-        self.patch(urllib2, 'urlopen', fake_it)
-
-        self.client._ping_url(None, APP_NAME, EMAIL)
+        self.client._login_success_cb(None, APP_NAME, EMAIL)
 
         self.assertEqual(self.args, None)
         self.assertEqual(self.kwargs, None)
+
+    def test_ping_is_signed_with_credentials(self):
+        """Ping to PING_URL is signed with user credentials."""
+        result = self.client._ping_url(U1_APP_NAME, EMAIL, TOKEN)
+        headers = self.args[0].headers
+        self.assertIn('Authorization', headers)
+        oauth_stuff = headers['Authorization']
+
+        expected = 'oauth_consumer_key="xQ7xDAz", ' \
+            'oauth_signature_method="HMAC-SHA1", oauth_version="1.0", ' \
+            'oauth_token="GkInOfSMGwTXAUoVQwLUoPxElEEUdhsLVNTPhxHJDUIeHCPNEo' \
+            '", oauth_signature="'
+        self.assertIn(expected, oauth_stuff)
+        self.assertEqual(result, 200)
+
+    def test_ping_is_done_before_sending_signal(self):
+        """Ping the server before sending any credential signal."""
+        self._patch('_ping_url')
+        self._patch('CredentialsFound')
+        self._patch('CredentialsError')
+        self._patch('AuthorizationDenied')
+
+        self.client._login_success_cb(None, APP_NAME, EMAIL)
+
+        self.assertEqual(len(self.calls), 2)
+        self.assertEqual(self.calls[0], ('_ping_url',
+                                         (APP_NAME, EMAIL, TOKEN), {}))
+        self.assertEqual(self.calls[1], ('CredentialsFound',
+                                         (APP_NAME, TOKEN), {}))
+
+    def test_send_error_if_ping_failed(self):
+        """Ping the server before sending any credential signal."""
+        self.expected = None
+
+        def fail(*args, **kwargs):
+            self.expected = AssertionError((args, kwargs))
+            raise self.expected
+
+        self.patch(self.client, '_ping_url', fail)
+        self._patch('CredentialsFound')
+        self._patch('CredentialsError')
+        self._patch('AuthorizationDenied')
+
+        self.client._login_success_cb(None, APP_NAME, EMAIL)
+
+        self.assertEqual(len(self.calls), 1)
+        self.assertEqual(self.calls[0][0], 'CredentialsError')
+        self.assertEqual(self.calls[0][1][0], APP_NAME)