Merge lp:~alecu/ubuntu-sso-client/disable-ignore-ssl-option into lp:ubuntu-sso-client

[Alejandro J. Cura]

- Do not allow ssl errors to be ignored (LP: #959390).

- Do not allow ssl errors to be ignored (LP: #959390).

[lp:~alecu/ubuntu-sso-client/disable-ignore-ssl-option]

925. By Alejandro J. Cura on 2012-03-19

merged with trunk

926. By Alejandro J. Cura on 2012-03-19

fix bad merge

[Manuel de la Peña (mandel)]

Great!

review: Approve

[Eric Casteleijn (thisfred)]

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-19 09:42:44 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-03-19 16:46:23 +0000
@@ -134,7 +134,8 @@
         self.nam = QNetworkAccessManager(QCoreApplication.instance())
         self.nam.finished.connect(self._handle_finished)
         self.nam.authenticationRequired.connect(self._handle_authentication)
-        self.nam.sslErrors.connect(self._handle_ssl_errors)
+        # Disabled until we make this a per-instance option
+        #self.nam.sslErrors.connect(self._handle_ssl_errors)
         self.replies = {}
         self.proxy_factory = None
         self.setup_proxy()

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-19 15:08:56 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-03-19 16:46:23 +0000
@@ -960,6 +960,7 @@
         """One of the headers matching key must contain a given value."""
         self.assertTrue(any(expected in value for value in headers))
 
+    @defer.inlineCallbacks
     def test_https_request(self):
         """Test using the correct proxy for the ssl request.
 
@@ -969,7 +970,7 @@
         certs.
         """
         # we fail due to the fake ssl cert
-        self.failUnlessFailure(self.wc.request(
+        yield self.failUnlessFailure(self.wc.request(
                                      self.base_ssl_iri + SIMPLERESOURCE),
                                      webclient.WebClientError)
         # https requests do not use the auth proxy therefore called should be