Merge lp:~salgado/offspring/private-projects into lp:~linaro-automation/offspring/private-builds

[Guilherme Salgado]

While hacking on another branch I noticed that .is_private and .is_visible_to(user) would crash with an AttributeError if there was no access-controlled object associated to the receiver of .is_private or .is_visible_to(user). This branch fixes that.

[James Tunnicliffe (dooferlad)]

review: Approve

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2011-10-20 16:13:00 +0000
+++ lib/offspring/web/queuemanager/models.py	2011-10-21 15:32:24 +0000
@@ -168,11 +168,18 @@
         return privacy_attr
 
     def _get_access_controlled_object(self):
+        """Return the object associated to this one that is access controlled.
+
+        In some cases the relationship between this model and the one which is
+        access controlled is NULLable (e.g. Lexbuilder.current_job), and if
+        that's the case and there's no access-controlled object linked to this
+        one, we return None.
+        """
         if getattr(self, 'access_relation', None) is None:
             return self
         names = self.access_relation.split('__')
         obj = self
-        while len(names):
+        while len(names) and obj is not None:
             name = names.pop(0)
             obj = getattr(obj, name)
         return obj
@@ -180,11 +187,15 @@
     @property
     def is_private(self):
         obj = self._get_access_controlled_object()
+        if obj is None:
+            return False
         return getattr(obj, self._privacy_attr_name)
 
     def is_visible_to(self, user):
-        is_visible_to = getattr(self._get_access_controlled_object(),
-                                self._is_visible_method_name)
+        obj = self._get_access_controlled_object()
+        if obj is None:
+            return True
+        is_visible_to = getattr(obj, self._is_visible_method_name)
         return is_visible_to(user)
 
 

=== modified file 'lib/offspring/web/queuemanager/tests/test_models.py'
--- lib/offspring/web/queuemanager/tests/test_models.py	2011-10-18 19:09:11 +0000
+++ lib/offspring/web/queuemanager/tests/test_models.py	2011-10-21 15:32:24 +0000
@@ -200,6 +200,18 @@
         return factory.makeLexbuilder(
             current_job=factory.makeBuildResult(project=project))
 
+    def test_lexbuilder_without_current_job(self):
+        # A Lexbuilder with no current_job is not considered private and thus
+        # is visible to anyone.
+        builder = factory.makeLexbuilder()
+        builder.current_job = None
+        builder.save()
+        user = factory.makeUser()
+        self.assertEqual(False, builder.is_private)
+        self.assertEqual(True, builder.is_visible_to(user))
+        self.assertEqual(
+            [builder], list(self.model.all_objects.accessible_by_user(user)))
+
 
 class BuildResultTests(
         TestCase, ReleaseOrLexbuilderOrBuildResultOrBuildRequestTestsMixin):