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

[dobey]

[Manuel de la Pena]

    - Set both application and nam proxy to work in all supported Qt versions. (LP: #1061528)

[Roberto Alsina (ralsina)]

review: Approve

[Mike McCracken (mikemc)]

review: Approve

=== modified file 'ubuntu_sso/utils/webclient/qtnetwork.py'
--- ubuntu_sso/utils/webclient/qtnetwork.py	2012-08-16 19:37:45 +0000
+++ ubuntu_sso/utils/webclient/qtnetwork.py	2012-10-04 17:52:38 +0000
@@ -104,6 +104,12 @@
         self.proxy_retry = False
         self.setup_proxy()
 
+    def _set_proxy(self, proxy):
+        """Set the proxy to be used."""
+        QNetworkProxy.setApplicationProxy(proxy)
+        # ensure that we work with the latest qt in ubuntu q
+        self.nam.setProxy(proxy)
+
     def setup_proxy(self):
         """Setup the proxy settings if needed."""
         # QtNetwork knows how to use the system settings on both Win and Mac
@@ -112,7 +118,7 @@
             enabled = len(settings) > 0
             if enabled and WebClient.proxy_instance is None:
                 proxy = build_proxy(settings)
-                QNetworkProxy.setApplicationProxy(proxy)
+                self._set_proxy(proxy)
                 WebClient.proxy_instance = proxy
             elif enabled and WebClient.proxy_instance:
                 logger.info("Proxy already in use.")
@@ -123,7 +129,7 @@
                 logger.info("Querying OS for proxy.")
                 query = QNetworkProxyQuery(QUrl(PROXY_REQUEST))
                 proxies = QNetworkProxyFactory.systemProxyForQuery(query)
-                QNetworkProxy.setApplicationProxy(proxies[0])
+                self._set_proxy(proxies[0])
                 WebClient.proxy_instance = proxies[0]
 
     def handle_proxy_auth(self, proxy, authenticator):
@@ -248,7 +254,7 @@
         """Setup this webclient to use the given proxy settings."""
         settings = {"https": https_settings}
         proxy = build_proxy(settings)
-        QNetworkProxy.setApplicationProxy(proxy)
+        self._set_proxy(proxy)
         WebClient.proxy_instance = proxy
 
     def shutdown(self):

=== modified file 'ubuntu_sso/utils/webclient/tests/test_qtnetwork.py'
--- ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2012-08-16 19:37:45 +0000
+++ ubuntu_sso/utils/webclient/tests/test_qtnetwork.py	2012-10-04 17:52:38 +0000
@@ -102,6 +102,8 @@
 
         self.patch(qtnetwork, 'build_proxy', fake_build_proxy)
         qtnetwork.WebClient.proxy_instance = None
+        self.patch(qtnetwork.QNetworkAccessManager, 'setProxy',
+                lambda _, p: self.called.append(('setProxy', p)))
         self.addCleanup(self._clean_webclient_instance)
 
     def _set_old_platform(self, platform):
@@ -129,6 +131,7 @@
         qtnetwork.WebClient()
         self.assertEqual(self.proxy, qtnetwork.WebClient.proxy_instance)
         self.assertIn(('setApplicationProxy', self.proxy), self.called)
+        self.assertIn(('setProxy', self.proxy), self.called)
         self.assertIn(('build_proxy', self.settings), self.called)
 
     def test_setup_instance_present(self):
@@ -138,6 +141,7 @@
         qtnetwork.WebClient()
         self.assertNotEqual(self.proxy, qtnetwork.WebClient.proxy_instance)
         self.assertNotIn(('setApplicationProxy', self.proxy), self.called)
+        self.assertNotIn(('setProxy', self.proxy), self.called)
         self.assertNotIn(('build_proxy', self.settings), self.called)