Merge lp:~dobey/ubuntu-sso-client/update-4-0 into lp:ubuntu-sso-client/stable-4-0

[dobey]

[Alejandro J. Cura]

    - Use unicode strings when writing to io.StringIO (LP: #1036270).

[Eric Casteleijn (thisfred)]

review: Approve

[lp:~dobey/ubuntu-sso-client/update-4-0]

967. By Alejandro J. Cura on 2012-08-28

[Alejandro J. Cura]

    - Use unicode strings when writing to io.StringIO (LP: #1036270).

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-07-02 19:16:16 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-08-28 17:30:29 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """A webclient backend that uses QtNetwork."""
 
+from __future__ import unicode_literals
+
 import sys
 from io import StringIO
 

=== modified file 'ubuntu_sso/utils/webclient/tests/test_qtnetwork.py'
--- ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2012-04-09 17:38:24 +0000
+++ ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2012-08-28 17:30:29 +0000
@@ -28,6 +28,7 @@
 # files in the program, then also delete it here.
 """Specific tests for the qt implementation."""
 
+from PyQt4.QtNetwork import QSslError
 from twisted.internet import defer
 from ubuntuone.devtools.testcases import TestCase
 
@@ -168,3 +169,32 @@
         self.assertNotEqual(self.proxy, qtnetwork.WebClient.proxy_instance)
         self.assertNotIn(('systemProxyForQuery', self.query), self.called)
         self.assertNotIn(('setApplicationProxy', self.proxy), self.called)
+
+
+class FakeQNetworkReply(object):
+    """A fake QNetworkReply."""
+
+    def __init__(self):
+        """Initialize this fake."""
+        url = qtnetwork.QUrl("http://fake_server")
+        self._request = qtnetwork.QNetworkRequest(url)
+
+    def request(self):
+        """Return a test network request."""
+        return self._request
+
+
+class SSLErrorsTestCase(TestCase):
+    """Tests for when SSL errors happen."""
+
+    def test_handle_ssl_errors(self):
+        """Test the _handle_ssl_errors method."""
+        result = []
+        self.patch(qtnetwork.logger, "error", result.append)
+        client = qtnetwork.WebClient()
+        reply = FakeQNetworkReply()
+        errors = [QSslError()]
+        # pylint: disable=W0212
+        client._handle_ssl_errors(reply, errors)
+        # pylint: enable=W0212
+        self.assertTrue(type(result[0]), unicode)