Merge lp:~alecu/ubuntuone-client/fix-broken-tunnel into lp:ubuntuone-client

[Alejandro J. Cura]

- Do not use the Qt Dbus mainloop on Windows (LP: #969150).
- Force using the system proxy on Windows (LP: #969157).

[Eric Casteleijn (thisfred)]

+1

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'tests/proxy/test_tunnel_server.py'
--- tests/proxy/test_tunnel_server.py	2012-03-24 00:10:25 +0000
+++ tests/proxy/test_tunnel_server.py	2012-03-30 12:59:21 +0000
@@ -549,6 +549,7 @@
 class FakeNetworkProxyFactoryClass(object):
     """A fake QNetworkProxyFactory."""
     last_query = None
+    use_system = False
 
     def __init__(self, enabled):
         """Initialize this fake instance."""
@@ -561,6 +562,16 @@
         """Return the proxy type configured."""
         return self.proxy_type
 
+    @classmethod
+    def setUseSystemConfiguration(cls, new_value):
+        """Save the system configuration requested."""
+        cls.use_system = new_value
+
+    @classmethod
+    def useSystemConfiguration(cls):
+        """Is the system configured for proxies?"""
+        return cls.use_system
+
     def systemProxyForQuery(self, query):
         """A list of proxies, but only type() will be called on the first."""
         return [self]
@@ -610,6 +621,7 @@
         self.patch(tunnel_server, "QNetworkProxyFactory", fake_netproxfact)
         self._assert_proxy_enabled("windows 1.0")
         self.assertEqual(len(self.app_proxy), 0)
+        self.assertTrue(fake_netproxfact.useSystemConfiguration())
 
     def test_platform_other_disabled(self):
         """Tests for any other platform with proxies disabled."""
@@ -617,6 +629,7 @@
         self.patch(tunnel_server, "QNetworkProxyFactory", fake_netproxfact)
         self._assert_proxy_disabled("windows 1.0")
         self.assertEqual(len(self.app_proxy), 0)
+        self.assertTrue(fake_netproxfact.useSystemConfiguration())
 
 
 class FakeQCoreApp(object):
@@ -683,3 +696,23 @@
         tunnel_server.main(["example.com", "443"])
         self.assertIn("Proxy not enabled.", self.fake_stdout.getvalue())
         self.assertEqual(FakeQCoreApp.fake_instance, None)
+
+    def test_qtdbus_installed_on_linux(self):
+        """The QtDbus mainloop is installed."""
+        self.patch(tunnel_server.sys, "platform", "linux123")
+        installed = []
+        self.patch(tunnel_server, "install_qt_dbus",
+                  lambda: installed.append(None))
+        self.proxies_enabled = True
+        tunnel_server.main(["example.com", "443"])
+        self.assertEqual(len(installed), 1)
+
+    def test_qtdbus_not_installed_on_windows(self):
+        """The QtDbus mainloop is installed."""
+        self.patch(tunnel_server.sys, "platform", "win98")
+        installed = []
+        self.patch(tunnel_server, "install_qt_dbus",
+                  lambda: installed.append(None))
+        self.proxies_enabled = True
+        tunnel_server.main(["example.com", "443"])
+        self.assertEqual(len(installed), 0)

=== modified file 'tests/syncdaemon/test_tunnel_runner.py'
--- tests/syncdaemon/test_tunnel_runner.py	2012-03-27 03:41:06 +0000
+++ tests/syncdaemon/test_tunnel_runner.py	2012-03-30 12:59:21 +0000
@@ -179,3 +179,12 @@
         self.addCleanup(delattr, sys, "frozen")
         self.assertEqual(os.path.dirname(self.tr.get_process_path()),
             os.path.dirname(sys.executable))
+
+    def test_start_process_win_devel(self):
+        """Test the windows devel case."""
+        fake_python = r"c:\python99\python.exe"
+        self.patch(sys, "platform", "win98")
+        self.patch(tunnel_runner.procutils, "which", lambda _: [fake_python])
+        tunnel_runner.TunnelRunner("fs-1.one.ubuntu.com", 443)
+        args, kwargs = self.spawned[1]
+        self.assertEqual(args[1], fake_python)

=== modified file 'ubuntuone/proxy/tunnel_server.py'
--- ubuntuone/proxy/tunnel_server.py	2012-03-24 00:10:25 +0000
+++ ubuntuone/proxy/tunnel_server.py	2012-03-30 12:59:21 +0000
@@ -353,19 +353,27 @@
             logger.info("Proxy is disabled.")
         return enabled
     else:
+        QNetworkProxyFactory.setUseSystemConfiguration(True)
         query = QNetworkProxyQuery(host, port)
         proxies = QNetworkProxyFactory.systemProxyForQuery(query)
         return len(proxies) and proxies[0].type() != QNetworkProxy.DefaultProxy
 
 
+def install_qt_dbus():
+    """Import and install the qt+dbus integration."""
+    from dbus.mainloop.qt import DBusQtMainLoop
+    DBusQtMainLoop(set_as_default=True)
+
+
 def main(argv):
     """The main function for the tunnel server."""
     if not check_proxy_enabled(*argv[1:]):
         sys.stdout.write("Proxy not enabled.")
         sys.stdout.flush()
     else:
-        from dbus.mainloop.qt import DBusQtMainLoop
-        DBusQtMainLoop(set_as_default=True)
+        if sys.platform.startswith("linux"):
+            install_qt_dbus()
+
         app = QCoreApplication(argv)
         cookie = str(uuid.uuid4())
         tunnel_server = TunnelServer(cookie)

=== modified file 'ubuntuone/syncdaemon/tunnel_runner.py'
--- ubuntuone/syncdaemon/tunnel_runner.py	2012-03-27 03:41:06 +0000
+++ ubuntuone/syncdaemon/tunnel_runner.py	2012-03-30 12:59:21 +0000
@@ -21,6 +21,7 @@
 from os import path
 
 from twisted.internet import defer, reactor
+from twisted.python import procutils
 
 from ubuntuone.platform.constants import TUNNEL_EXECUTABLE
 
@@ -48,8 +49,12 @@
         from ubuntuone.proxy.tunnel_client import TunnelProcessProtocol
         protocol = TunnelProcessProtocol(self.client_d)
         process_path = self.get_process_path()
-        args = [TUNNEL_EXECUTABLE, host, str(port)]
-        self.process_transport = reactor.spawnProcess(protocol, process_path,
+        args = [process_path, host, str(port)]
+        if sys.platform.startswith("win") and not process_path.endswith("exe"):
+            python_exe = procutils.which("python.exe")
+            if python_exe:
+                args.insert(0, python_exe[0])
+        self.process_transport = reactor.spawnProcess(protocol, args[0],
                                                       env=None, args=args)
         reactor.addSystemEventTrigger("before", "shutdown", self.stop)