Merge lp:~ralsina/ubuntu-sso-client/spawn-evil into lp:ubuntu-sso-client

[Roberto Alsina]

 - Return the executable's dirname as BIN_DIR for frozen binaries (LP: #956187).

 - Return the executable's dirname as BIN_DIR for frozen binaries (LP: #956187).

[Diego Sarmentero (diegosarmentero)]

[FAIL]
Traceback (most recent call last):
  File "/media/gato/proyectos/canonical/ubuntu-sso-client-ralsina/ubuntu_sso/utils/tests/test_common.py", line 163, in test_frozen_binary
    self.assertEqual("foobar", result)
  File "/usr/lib/python2.7/dist-packages/twisted/trial/unittest.py", line 270, in assertEqual
    % (msg, pformat(first), pformat(second)))
twisted.trial.unittest.FailTest: not equal:
a = 'foobar'
b = '/usr/bin'

ubuntu_sso.utils.tests.test_common.GetBinDirTestCase.test_frozen_binary
-------------------------------------------------------------------------------
Ran 775 tests in 31.097s

FAILED (skips=9, failures=1, successes=765)

review: Needs Fixing

[lp:~ralsina/ubuntu-sso-client/spawn-evil]

918. By Roberto Alsina on 2012-03-15

oops

[Roberto Alsina (ralsina)]

oops, fixed.

[dobey (dobey)]

review: Approve

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-02-17 20:48:27 +0000
+++ ubuntu_sso/utils/__init__.py	2012-03-15 20:05:21 +0000
@@ -88,6 +88,12 @@
     found, return the value of the BIN_DIR.
 
     """
+    # If sys is frozen, this is an .exe, and all binaries are in
+    # the same place
+    if hasattr(sys, "frozen"):
+        exec_path = os.path.abspath(sys.executable)
+        return os.path.dirname(exec_path)
+
     result = _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
     assert result is not None, '%r dir can not be None.' % BIN_SUFFIX
     return result

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2012-02-15 20:21:52 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2012-03-15 20:05:21 +0000
@@ -17,6 +17,7 @@
 """Tests for the oauth_headers helper function."""
 
 import logging
+import os
 import sys
 import time
 
@@ -146,13 +147,21 @@
         self.assertEqual(expected, result)
 
 
-class GetBinDirTestCase(TestCase):
+class GetBinDirTestCase(GetProjectDirTestCase):
     """Test case for get_bin_dir when constants module is not defined."""
 
     DIR_NAME = utils.BIN_SUFFIX
     DIR_CONSTANT = 'BIN_DIR'
     DIR_GETTER = 'get_bin_dir'
 
+    def test_frozen_binary(self):
+        """Test that frozen binaries return a valid path."""
+        sys.frozen = True
+        self.addCleanup(delattr, sys, "frozen")
+        expected = os.path.dirname(os.path.abspath(sys.executable))
+        result = self.get_dir()
+        self.assertEqual(expected, result)
+
 
 class GetBinDirWithConstantsTestCase(GetProjectDirWithConstantsTestCase):
     """Test case for get_bin_dir when constants module is not defined."""