Merge lp:~zyga/checkbox/fix-1298452 into lp:checkbox

[Zygmunt Krynicki]

fe77cbd plainbox:secure:providers: implement CHECKBOX_SHARE with Provider1.base_dir

[Brendan Donegan (brendan-donegan)]

Cool, thanks

review: Approve

=== modified file 'plainbox/plainbox/impl/secure/providers/test_v1.py'
--- plainbox/plainbox/impl/secure/providers/test_v1.py	2014-03-28 12:30:48 +0000
+++ plainbox/plainbox/impl/secure/providers/test_v1.py	2014-03-28 13:03:06 +0000
@@ -733,14 +733,13 @@
         Verify that Provider1.CHECKBOX_SHARE is defined as the parent directory
         of data_dir
         """
-        self.assertEqual(self.provider.CHECKBOX_SHARE,
-                         os.path.join(self.DATA_DIR, ".."))
+        self.assertEqual(self.provider.CHECKBOX_SHARE, self.BASE_DIR)
 
-    def test_CHECKBOX_SHARE__without_data_dir(self):
-        """
-        Verify that Provider1.CHECKBOX_SHARE is None without data_dir
-        """
-        self.provider._data_dir = None
+    def test_CHECKBOX_SHARE__without_base_dir(self):
+        """
+        Verify that Provider1.CHECKBOX_SHARE is None without base_dir
+        """
+        self.provider._base_dir = None
         self.assertEqual(self.provider.CHECKBOX_SHARE, None)
 
     def test_extra_PYTHONPATH(self):
 
=== modified file 'plainbox/plainbox/impl/secure/providers/v1.py'
--- plainbox/plainbox/impl/secure/providers/v1.py	2014-03-28 12:30:48 +0000
+++ plainbox/plainbox/impl/secure/providers/v1.py	2014-03-28 13:03:06 +0000
@@ -356,10 +356,7 @@
             This variable is only required by one script.
             It would be nice to remove this later on.
         """
-        if self._data_dir is None:
-            return None
-        else:
-            return os.path.join(self._data_dir, "..")
+        return self.base_dir
 
     @property
     def extra_PYTHONPATH(self):