Merge lp:~nataliabidart/ubuntu-sso-client/find-me-bin-dir into lp:ubuntu-sso-client

[Natalia Bidart]

- Make the bin_dir discoverable when running from the system installation
  (LP: #933039).

[dobey (dobey)]

review: Approve

[lp:~nataliabidart/ubuntu-sso-client/find-me-bin-dir]

876. By Natalia Bidart on 2012-02-15

- Adding asserts to be more expliciti when something goes wrong regarding data/
and bin/ dir calculation.

877. By Natalia Bidart on 2012-02-15

- Fixed tests.

[Roberto Alsina (ralsina)]

+1

review: Approve

=== modified file 'ubuntu_sso/utils/__init__.py'
--- ubuntu_sso/utils/__init__.py	2012-02-11 19:25:01 +0000
+++ ubuntu_sso/utils/__init__.py	2012-02-15 20:26:17 +0000
@@ -54,9 +54,11 @@
 
     # otherwise, try to load 'dir_constant' from installation path
     try:
+        # Unused variable 'ubuntu_sso', pylint: disable=W0612
+        import ubuntu_sso.constants
         module = sys.modules.get('ubuntu_sso.constants')
         return getattr(module, dir_constant)
-    except AttributeError:
+    except (ImportError, AttributeError):
         msg = '_get_dir: can not build a valid path. Giving up. ' \
               '__file__ is %r, constants module not available.'
         logger.error(msg, __file__)
@@ -69,7 +71,9 @@
     found, return the value of the PROJECT_DIR.
 
     """
-    return _get_dir(dir_name=DATA_SUFFIX, dir_constant='PROJECT_DIR')
+    result = _get_dir(dir_name=DATA_SUFFIX, dir_constant='PROJECT_DIR')
+    assert result is not None, '%r dir can not be None.' % DATA_SUFFIX
+    return result
 
 
 def get_data_file(*args):
@@ -84,7 +88,9 @@
     found, return the value of the BIN_DIR.
 
     """
-    return _get_dir(dir_name=BIN_SUFFIX, dir_constant='BIN_DIR')
+    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
 
 
 class RequestHead(urllib2.Request):

=== modified file 'ubuntu_sso/utils/tests/test_common.py'
--- ubuntu_sso/utils/tests/test_common.py	2012-02-11 19:25:01 +0000
+++ ubuntu_sso/utils/tests/test_common.py	2012-02-15 20:26:17 +0000
@@ -124,8 +124,7 @@
         self.patch(utils.os.path, 'exists', lambda path: False)
         sys.modules[CONSTANTS_MODULE] = None
 
-        result = self.get_dir()
-        self.assertTrue(result is None)
+        self.assertRaises(AssertionError, self.get_dir)
         msg = 'get_dir: can not build a valid path.'
         self.assertTrue(self.memento.check_error(msg))