Merge lp:~ralsina/ubuntuone-client/find_exes into lp:ubuntuone-client

[Roberto Alsina]

Fix tunnel spawning code so that it works on windows.

Fix tunnel spawning code so that it works on windows.

[Alejandro J. Cura (alecu)]

78 - args = [TUNNEL_EXECUTABLE, host, str(port)]
79 + args = [host, str(port)]

The above change will make this branch fail on linux.
According to the twisted docs, "The first string should be the executable's name.":
http://twistedmatrix.com/documents/current/api/twisted.internet.interfaces.IReactorProcess.spawnProcess.html

Did you need this change in order to make it work on Windows?

review: Needs Information

[Roberto Alsina (ralsina)]

> 78 - args = [TUNNEL_EXECUTABLE, host, str(port)]
> 79 + args = [host, str(port)]
>
> The above change will make this branch fail on linux.
> According to the twisted docs, "The first string should be the executable's
> name.":
> http://twistedmatrix.com/documents/current/api/twisted.internet.interfaces.IRe
> actorProcess.spawnProcess.html
>
> Did you need this change in order to make it work on Windows?

No, I don't know where that came from. Reverted.

[lp:~ralsina/ubuntuone-client/find_exes]

1216. By Roberto Alsina on 2012-03-19

style fix

1217. By Roberto Alsina on 2012-03-19

cleanup frozen on test

[Natalia Bidart (nataliabidart)]

* Can you please revert the unrelated change in ubuntuone/syncdaemon/interaction_interfaces.py?

* Typo in "surces".

* Since you already have changes to make, could you please add a space after the # in "#Only"?

Thanks!

review: Needs Fixing

[lp:~ralsina/ubuntuone-client/find_exes]

1218. By Roberto Alsina on 2012-03-19

fixes suggested by nessita

[Roberto Alsina (ralsina)]

> * Can you please revert the unrelated change in
> ubuntuone/syncdaemon/interaction_interfaces.py?
>
> * Typo in "surces".
>
> * Since you already have changes to make, could you please add a space after
> the # in "#Only"?
>
> Thanks!

All 3 done in revo 1218

[Natalia Bidart (nataliabidart)]

Looks good!

review: Approve

[Brian Curtin (brian.curtin)]

39 + TUNNEL_EXECUTABLE = "ubuntuone-proxy-tunnel.exe"

It'd be safer to do ```TUNNEL_EXECUTABLE += ".exe"```

review: Needs Fixing

[lp:~ralsina/ubuntuone-client/find_exes]

1219. By Roberto Alsina on 2012-03-19

brian curtin's suggestion

[Roberto Alsina (ralsina)]

> 39 + TUNNEL_EXECUTABLE = "ubuntuone-proxy-tunnel.exe"
>
> It'd be safer to do ```TUNNEL_EXECUTABLE += ".exe"```

you are right, changed

[Brian Curtin (brian.curtin)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

Looks fine!

review: Approve

=== modified file 'tests/syncdaemon/test_tunnel_runner.py'
--- tests/syncdaemon/test_tunnel_runner.py	2012-03-16 03:15:28 +0000
+++ tests/syncdaemon/test_tunnel_runner.py	2012-03-19 14:47:17 +0000
@@ -15,6 +15,9 @@
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 """Tests for the proxy tunnel runner."""
 
+import os
+import sys
+
 from twisted.internet import defer, error, reactor, task
 from twisted.trial.unittest import TestCase
 
@@ -116,3 +119,10 @@
         client = yield self.tr.get_client()
         self.assertEqual(client.tunnel_port, FAKE_PORT)
         self.assertEqual(client.cookie, FAKE_COOKIE)
+
+    def test_frozen_path(self):
+        """Ensure the path is correct if sys is frozen."""
+        sys.frozen = "Yes"
+        self.addCleanup(delattr, sys, "frozen")
+        self.assertEqual(os.path.dirname(self.tr.get_process_path()),
+            os.path.dirname(sys.executable))

=== modified file 'ubuntuone/platform/constants.py'
--- ubuntuone/platform/constants.py	2011-12-08 20:56:10 +0000
+++ ubuntuone/platform/constants.py	2012-03-19 14:47:17 +0000
@@ -21,7 +21,12 @@
 
 import sys
 
+TUNNEL_EXECUTABLE = "ubuntuone-proxy-tunnel"
+
 if sys.platform == "win32":
     HASHQUEUE_DELAY = 3.0
+    if getattr(sys, "frozen", None) is not None:
+        # Only use the .exe suffix in windows+frozen
+        TUNNEL_EXECUTABLE += ".exe"
 else:
     HASHQUEUE_DELAY = 0.5

=== modified file 'ubuntuone/syncdaemon/tunnel_runner.py'
--- ubuntuone/syncdaemon/tunnel_runner.py	2012-03-12 17:42:57 +0000
+++ ubuntuone/syncdaemon/tunnel_runner.py	2012-03-19 14:47:17 +0000
@@ -16,13 +16,14 @@
 """Run the tunnel process and start a client, with a reactor as a fallback."""
 
 import logging
+import sys
 
 from os import path
 
 from twisted.internet import defer, reactor
 
+from ubuntuone.platform.constants import TUNNEL_EXECUTABLE
 
-TUNNEL_EXECUTABLE = "ubuntuone-proxy-tunnel"
 logger = logging.getLogger("ubuntuone.SyncDaemon.TunnelRunner")
 
 
@@ -48,11 +49,18 @@
 
     def get_process_path(self):
         """Get the path to the tunnel process."""
+        # In a frozen setting, all binaries are in the same path
+        if getattr(sys, "frozen", None) is not None:
+            return path.join(path.dirname(
+                path.abspath(sys.executable)), TUNNEL_EXECUTABLE)
+
+        # This works when we are running from sources
         filename = path.join(path.dirname(__file__), "..", "..", "bin",
                              TUNNEL_EXECUTABLE)
         if path.isfile(filename):
             return filename
 
+        # Use the configured LIBEXECDIR
         from ubuntuone.clientdefs import LIBEXECDIR
         return path.join(LIBEXECDIR, TUNNEL_EXECUTABLE)