Merge lp:~mandel/ubuntu-sso-client/fix-oneric-tests into lp:ubuntu-sso-client

[Manuel de la Peña]

- Use a QNetworkAccessManager to work around the issue that on older version of Qt in the second request the finished signal is not fired (LP: #990048).

- Use a QNetworkAccessManager to work around the issue that on older version of Qt in the second request the finished signal is not fired (LP: #990048).

The main problem is that the signal is not fired, therefore we now have a collections of nams (kept in case we call shutdown in the middle). When the finish signal is fired we pass the nam (to call deleteLater) and the reply which contains the info from the request.

You will notice that some tests have been removed the reason is that they are not correct and the feature they were testing has been removed.

Also please take the following into account:

<alecu> mandel, also: make some wall clock tests to see that the time it takes the control panel to open and get all the info is not severely affected by using multiple nams
<alecu> mandel, and another thing that could break: the proxy password dialog may open too many times in this case...
<alecu> mandel, (multiple nams means that control panel api calls cannot reuse a single http connection)
<alecu> mandel, other than that, the code looks good, and it's a very good idea to try this as it will likely fix the issue with cached proxy credentials.

[lp:~mandel/ubuntu-sso-client/fix-oneric-tests]

956. By Manuel de la Peña on 2012-05-02

Remove left over print.

Unmerged revisions

956. By Manuel de la Peña on 2012-05-02

Remove left over print.

955. By Manuel de la Peña on 2012-05-02

Link bug.

954. By Manuel de la Peña on 2012-05-02

Clean the resources better in case we want to shutdown when there is a nam is used. Remove ssl tests that do not longer make sense.

953. By Manuel de la Peña on 2012-05-02

Fix timeout issues ensuring that we will use a new nam per request.

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-04-24 14:05:22 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-05-02 15:19:20 +0000
@@ -93,15 +93,21 @@
     def __init__(self, *args, **kwargs):
         """Initialize this instance."""
         super(WebClient, self).__init__(*args, **kwargs)
-        self.nam = QNetworkAccessManager(QCoreApplication.instance())
-        self.nam.finished.connect(self._handle_finished)
-        self.nam.authenticationRequired.connect(self._handle_authentication)
-        self.nam.proxyAuthenticationRequired.connect(self.handle_proxy_auth)
-        self.nam.sslErrors.connect(self._handle_ssl_errors)
+        self.nams = []
         self.replies = {}
         self.proxy_retry = False
         self.setup_proxy()
 
+    def build_nam(self):
+        """Build a QNetworkAccessManager to perform requests."""
+        nam = QNetworkAccessManager(QCoreApplication.instance())
+        nam.finished.connect(lambda reply: self._handle_finished(reply, nam))
+        nam.authenticationRequired.connect(self._handle_authentication)
+        nam.proxyAuthenticationRequired.connect(self.handle_proxy_auth)
+        nam.sslErrors.connect(self._handle_ssl_errors)
+        self.nams.append(nam)
+        return nam
+
     def setup_proxy(self):
         """Setup the proxy settings if needed."""
         # QtNetwork knows how to use the system settings on both Win and Mac
@@ -137,15 +143,15 @@
             authenticator.setPassword(self.proxy_password)
             WebClient.proxy_instance.setPassword(self.proxy_password)
 
-    def _perform_request(self, request, method, post_buffer):
+    def _perform_request(self, nam, request, method, post_buffer):
         """Return a deferred that will be fired with a Response object."""
         d = defer.Deferred()
         if method == "GET":
-            reply = self.nam.get(request)
+            reply = nam.get(request)
         elif method == "HEAD":
-            reply = self.nam.head(request)
+            reply = nam.head(request)
         else:
-            reply = self.nam.sendCustomRequest(request, method, post_buffer)
+            reply = nam.sendCustomRequest(request, method, post_buffer)
         self.replies[reply] = d
         return d
 
@@ -153,6 +159,7 @@
     def request(self, iri, method="GET", extra_headers=None,
                 oauth_credentials=None, post_content=None):
         """Return a deferred that will be fired with a Response object."""
+        nam = self.build_nam()
         uri = self.iri_to_uri(iri)
         request = QNetworkRequest(QUrl(uri))
         headers = yield self.build_request_headers(uri, method, extra_headers,
@@ -164,7 +171,8 @@
         post_buffer = QBuffer()
         post_buffer.setData(post_content)
         try:
-            result = yield self._perform_request(request, method, post_buffer)
+            result = yield self._perform_request(nam, request, method,
+                                                 post_buffer)
         except ProxyUnauthorizedError, e:
             app_proxy = QNetworkProxy.applicationProxy()
             proxy_host = app_proxy.hostName() if app_proxy else "proxy server"
@@ -186,7 +194,7 @@
         if authenticator.password() != self.password:
             authenticator.setPassword(self.password)
 
-    def _handle_finished(self, reply):
+    def _handle_finished(self, reply, nam):
         """The reply has finished processing."""
         assert reply in self.replies
         d = self.replies.pop(reply)
@@ -211,6 +219,8 @@
             else:
                 exception = WebClientError(error_string, content)
             d.errback(exception)
+        nam.deleteLater()
+        self.nams.remove(nam)
 
     def _get_certificate_details(self, cert):
         """Return an string with the details of the certificate."""
@@ -251,4 +261,5 @@
 
     def shutdown(self):
         """Shut down all pending requests (if possible)."""
-        self.nam.deleteLater()
+        for nam in self.nams:
+            nam.deleteLater()

=== modified file 'ubuntu_sso/utils/webclient/tests/test_timestamp.py'
--- ubuntu_sso/utils/webclient/tests/test_timestamp.py	2012-04-26 13:51:20 +0000
+++ ubuntu_sso/utils/webclient/tests/test_timestamp.py	2012-05-02 15:19:20 +0000
@@ -136,4 +136,4 @@
         self.assertEqual(len(self.ws.root.request_headers), 1)
         headers = self.ws.root.request_headers[0]
         result = headers.getRawHeaders("Cache-Control")
-        self.assertEqual(result, ["no-cache"])
+        self.assertIn("no-cache", ' '.join(result))

=== modified file 'ubuntu_sso/utils/webclient/tests/test_webclient.py'
--- ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-04-24 14:05:22 +0000
+++ ubuntu_sso/utils/webclient/tests/test_webclient.py	2012-05-02 15:19:20 +0000
@@ -1131,25 +1131,6 @@
 
         self.patch(BaseWebClient, '_launch_ssl_dialog', fake_launch_ssl_dialog)
 
-    @defer.inlineCallbacks
-    def _assert_ssl_fail_user_accepts(self, proxy_settings=None):
-        """Assert the dialog is shown in an ssl fail."""
-        self.return_code = USER_SUCCESS
-        if proxy_settings:
-            self.wc.force_use_proxy(proxy_settings)
-        yield self.wc.request(self.base_iri + SIMPLERESOURCE)
-        details = SSL_DETAILS_TEMPLATE % self.cert_details
-        self.assertIn(('_launch_ssl_dialog', gethostname(), details),
-                      self.called)
-
-    def test_ssl_fail_dialog_user_accepts(self):
-        """Test showing the dialog and accepting."""
-        self._assert_ssl_fail_user_accepts()
-
-    def test_ssl_fail_dialog_user_accepts_via_proxy(self):
-        """Test showing the dialog and accepting when using a proxy."""
-        self._assert_ssl_fail_user_accepts(self.get_nonauth_proxy_settings())
-
     def test_ssl_fail(self):
         """Test showing the dialog and rejecting."""
         self.failUnlessFailure(self.wc.request(
@@ -1166,6 +1147,4 @@
     if (WEBCLIENT_MODULE_NAME.endswith(".txweb") or
             WEBCLIENT_MODULE_NAME.endswith(".libsoup")):
         reason = 'SSL support has not yet been implemented.'
-        test_ssl_fail_dialog_user_accepts.skip = reason
-        test_ssl_fail_dialog_user_accepts_via_proxy.skip = reason
         test_ssl_fail.skip = reason