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

[Alejandro J. Cura]

- reactor.spawnProcess throws an error on windows if it can't find the binary to run (LP: #965897).

- reactor.spawnProcess throws an error on windows if it can't find the binary to run (LP: #965897).

[Natalia Bidart (nataliabidart)]

I like it!

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Brian Curtin (brian.curtin)]

In a slightly more convoluted way, I covered the same case yesterday in https://code.launchpad.net/~brian.curtin/ubuntuone-client/tunnelrunner-mishaps revs 1218 and 1219.

review: Approve

=== modified file 'tests/syncdaemon/test_tunnel_runner.py'
--- tests/syncdaemon/test_tunnel_runner.py	2012-03-27 03:44:19 +0000
+++ tests/syncdaemon/test_tunnel_runner.py	2012-03-27 03:44:19 +0000
@@ -47,6 +47,14 @@
         client = yield tr.get_client()
         self.assertEqual(client, reactor)
 
+    @defer.inlineCallbacks
+    def test_executable_not_found(self):
+        """The executable is not found anywhere."""
+        self.patch(tunnel_runner, "TUNNEL_EXECUTABLE", "this_does_not_exist")
+        tr = tunnel_runner.TunnelRunner(FAKE_HOST, FAKE_PORT)
+        client = yield tr.get_client()
+        self.assertEqual(client, reactor)
+
 
 class FakeProcessTransport(object):
     """A fake ProcessTransport."""

=== modified file 'ubuntuone/syncdaemon/tunnel_runner.py'
--- ubuntuone/syncdaemon/tunnel_runner.py	2012-03-27 03:44:19 +0000
+++ ubuntuone/syncdaemon/tunnel_runner.py	2012-03-27 03:44:19 +0000
@@ -39,6 +39,9 @@
         except ImportError:
             logger.info("Proxy support not installed.")
             self.client_d.callback(reactor)
+        except Exception:
+            logger.exception("Error while starting tunnel process:")
+            self.client_d.callback(reactor)
 
     def start_process(self, host, port):
         """Start the tunnel process."""