Merge lp:~mikemc/ubuntu-sso-client/fix-992593-backend-path-darwin-pkgd into lp:ubuntu-sso-client

[Mike McCracken]

- Use correct path to packaged backend executables on darwin. (LP: #992593)

[Diego Sarmentero (diegosarmentero)]

I think we can have some tests here to check the different returns.
You can check a test for when we have sys.frozen = True here:
http://bazaar.launchpad.net/~ubuntuone-control-tower/ubuntu-sso-client/trunk/view/head:/ubuntu_sso/utils/tests/test_common.py#L170

review: Needs Fixing

[lp:~mikemc/ubuntu-sso-client/fix-992593-backend-path-darwin-pkgd]

983. By Mike McCracken on 2012-06-29

Merged path-fixes into fix-992593-activation-cmdline.

984. By Mike McCracken on 2012-06-29

Add tests for get_activation_cmdline on darwin and windows.

985. By Mike McCracken on 2012-06-29

add missing import

986. By Mike McCracken on 2012-06-29

add missing import, again

987. By Mike McCracken on 2012-06-29

Fix windows tests and relative path for syncdaemon from source on windows.

[Mike McCracken (mikemc)]

Tests added, and made change to use source tree binaries on windows when running from source.

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[dobey (dobey)]

Why are there references to syncdaemon here? I thought we agreed those belong in ubuntuone-client?

review: Needs Fixing

Unmerged revisions

987. By Mike McCracken on 2012-06-29

Fix windows tests and relative path for syncdaemon from source on windows.

986. By Mike McCracken on 2012-06-29

add missing import, again

985. By Mike McCracken on 2012-06-29

add missing import

984. By Mike McCracken on 2012-06-29

Add tests for get_activation_cmdline on darwin and windows.

983. By Mike McCracken on 2012-06-29

Merged path-fixes into fix-992593-activation-cmdline.

982. By Mike McCracken on 2012-06-29

Use correct paths to backend helper apps on darwin when packaged. (LP: #992593)

981. By Mike McCracken on 2012-06-29

Use buildout python to run subprocesses during development. (LP: #1018924)

=== modified file 'ubuntu_sso/main/darwin.py'
--- ubuntu_sso/main/darwin.py	2012-06-29 22:29:26 +0000
+++ ubuntu_sso/main/darwin.py	2012-06-29 22:29:26 +0000
@@ -27,6 +27,7 @@
 
 import os
 import os.path
+import sys
 
 from dirspec import basedir
 from twisted.internet import defer
@@ -59,8 +60,27 @@
 
 def get_activation_cmdline(name):
     """Find the path to the executable callback."""
-    # TODO: We have to either use launchd to launch the different services
-    # on demand or us LaunchServices to handle running the app via an URL.
+    if getattr(sys, "frozen", None) is not None:
+        # We are running from a sub-package, so find the SSO Helper
+        # app (a packaged version of ubuntu-sso-login) in the
+        # Resources directory of the main .app package.
+
+        main_app_dir = "".join(__file__.partition(".app")[:-1])
+        main_app_resources_dir = os.path.join(main_app_dir,
+                                              "Contents",
+                                              "Resources")
+        if name == SSO_SERVICE_NAME:
+            return os.path.join(main_app_resources_dir,
+                                "Ubuntu SSO Helper.app",
+                                "Contents", "MacOS",
+                                "ubuntu-sso-login")
+        elif name == SD_SERVICE_NAME:
+            return os.path.join(main_app_resources_dir,
+                                "UbuntuOne Syncdaemon.app",
+                                "Contents", "MacOS",
+                                "ubuntuone-syncdaemon")
+        else:
+            raise Exception("unknown service name %r" % name)
 
     module_filename = ubuntu_sso.__file__
     ubuntu_sso_pkg_dir = os.path.dirname(os.path.dirname(module_filename))

=== modified file 'ubuntu_sso/main/tests/test_darwin.py'
--- ubuntu_sso/main/tests/test_darwin.py	2012-04-30 16:15:46 +0000
+++ ubuntu_sso/main/tests/test_darwin.py	2012-06-29 22:29:26 +0000
@@ -16,10 +16,12 @@
 """Darwin specific tests for the main module."""
 
 import os
+import sys
 
 from dirspec import basedir
 from twisted.internet import defer
 
+import ubuntu_sso
 from ubuntu_sso.main import darwin
 from ubuntu_sso.tests import TestCase
 
@@ -35,6 +37,43 @@
         expected = os.path.join(basedir.xdg_cache_home, 'sso', 'ipc')
         self.assertEqual(darwin.get_sso_domain_socket(), expected)
 
+    def test_get_ac_cmdline_unfrozen_sso(self):
+        """When unfrozen, cmdline should point to source tree /bin."""
+        self.patch(ubuntu_sso, '__file__', "test/ubuntu_sso/__init__.py")
+        cmd = darwin.get_activation_cmdline(darwin.SSO_SERVICE_NAME)
+        self.assertEqual(cmd, "python test/bin/ubuntu-sso-login")
+
+    def test_get_ac_cmdline_unfrozen_sd(self):
+        """When unfrozen, cmdline should point to source tree /bin."""
+        self.patch(ubuntu_sso, '__file__', "test/ubuntu_sso/__init__.py")
+        cmd = darwin.get_activation_cmdline(darwin.SD_SERVICE_NAME)
+        expected = "python test/../ubuntuone-client/bin/ubuntuone-syncdaemon"
+        self.assertEqual(cmd, expected)
+
+    def test_get_ac_cmdline_frozen_sso(self):
+        """When frozen, cmdline should point to a sub-app path."""
+        sys.frozen = True
+        self.addCleanup(delattr, sys, "frozen")
+        self.patch(darwin, "__file__",
+                   "/test/Main.app/ignore/the/rest")
+        cmd = darwin.get_activation_cmdline(darwin.SSO_SERVICE_NAME)
+        subapp_path = "Ubuntu SSO Helper.app/Contents/MacOS/ubuntu-sso-login"
+        expected = os.path.join("/test/Main.app/Contents/Resources",
+                                subapp_path)
+        self.assertEqual(cmd, expected)
+
+    def test_get_ac_cmdline_frozen_sd(self):
+        """When frozen, cmdline should point to a sub-app path."""
+        sys.frozen = True
+        self.addCleanup(delattr, sys, "frozen")
+        self.patch(darwin, "__file__",
+                   "/test/Main.app/ignore/the/rest")
+        cmd = darwin.get_activation_cmdline(darwin.SD_SERVICE_NAME)
+        sub = "UbuntuOne Syncdaemon.app/Contents/MacOS/ubuntuone-syncdaemon"
+        expected = os.path.join("/test/Main.app/Contents/Resources",
+                                sub)
+        self.assertEqual(cmd, expected)
+
 
 class DescriptionFactoryTestcase(TestCase):
     """Test the factory."""

=== modified file 'ubuntu_sso/main/tests/test_windows.py'
--- ubuntu_sso/main/tests/test_windows.py	2012-06-27 20:16:56 +0000
+++ ubuntu_sso/main/tests/test_windows.py	2012-06-29 22:29:26 +0000
@@ -28,6 +28,8 @@
 # files in the program, then also delete it here.
 """Windows specific tests for the main module."""
 
+import os
+import sys
 # pylint: disable=F0401
 try:
     import winreg
@@ -111,8 +113,11 @@
                          uid_modulo * windows.SSO_PORT_ALLOCATION_STEP)
         self._test_port_assignation(uid, expected_port)
 
-    def test_get_activation_cmdline(self):
+    def test_get_activation_cmdline_frozen(self):
         """Test the get_activation_cmdline method."""
+        sys.frozen = True
+        self.addCleanup(delattr, sys, "frozen")
+
         sample_value = "test 123"
         self.patch(windows.winreg, "OpenKey",
                    lambda key, subkey: sample_value)
@@ -122,6 +127,26 @@
             perspective_broker.SSO_SERVICE_NAME)
         self.assertEqual(sample_value, cmdline)
 
+    def test_get_ac_cmdline_unfrozen_sso(self):
+        """When unfrozen, cmdline should point to source tree /bin."""
+        self.patch(sys, 'argv',
+                   [os.path.join('parts', 'ubuntu-sso-client',
+                                 'bin', 'ubuntu-sso-login-qt')])
+        cmd = windows.get_activation_cmdline(windows.SSO_SERVICE_NAME)
+        self.assertEqual(cmd,
+                         "python " + os.path.join('parts', 'ubuntu-sso-client',
+                                                  'bin', 'ubuntu-sso-login'))
+
+    def test_get_ac_cmdline_unfrozen_sd(self):
+        """When unfrozen, cmdline should point to source tree /bin."""
+        self.patch(sys, 'argv',
+                   [os.path.join('parts', 'ubuntu-sso-client', 'bin',
+                                 'ubuntu-sso-login-qt')])
+        cmd = windows.get_activation_cmdline('ubuntuone-syncdaemon')
+        expected = "python " + os.path.join('parts', 'ubuntuone-client',
+                                            'bin', 'ubuntuone-syncdaemon')
+        self.assertEqual(cmd, expected)
+
 
 class DescriptionFactoryTestcase(TestCase):
     """Test the factory."""

=== modified file 'ubuntu_sso/main/windows.py'
--- ubuntu_sso/main/windows.py	2012-06-29 22:29:26 +0000
+++ ubuntu_sso/main/windows.py	2012-06-29 22:29:26 +0000
@@ -38,6 +38,8 @@
 
 """
 
+import os
+import sys
 # pylint: disable=F0401
 import win32process
 import win32security
@@ -97,6 +99,10 @@
         if name == SSO_SERVICE_NAME:
             exe_name = 'ubuntu-sso-login'
         else:
+            parts_dir_l = dirname.split(os.path.sep)[:-2]
+            parts_dirname = os.path.sep.join(parts_dir_l)
+            dirname = os.path.join(parts_dirname,
+                                   'ubuntuone-client', 'bin')
             exe_name = 'ubuntuone-syncdaemon'
         value = os.path.join(dirname, exe_name)
         return "python " + value