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

[Guilherme Salgado]

This branch changes the builder list to redact information about private projects the user doesn't have the rights to see.

I've also noticed that no versions of django are able to work with Oneiric's psycopg2 package (version 2.4.2), so I've changed the requirements to specify we need psycopg2>=2.0.6,<=2.4.1. (I've created a new WI to get the new dependencies added to lp:~oem-solutions-releng/offspring/offspring-deps/)

[lp:~salgado/offspring/builder-list]

67. By Guilherme Salgado on 2011-10-18

Stub Lexbuilder.average_load on BuilderListTests so that we can run the tests there with sqlite3

[James Tunnicliffe (dooferlad)]

Looks fine.

review: Approve

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2011-10-10 21:15:48 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2011-10-18 15:56:27 +0000
@@ -9,6 +9,7 @@
 
 from offspring.enums import ProjectBuildStates
 from offspring.web.queuemanager.models import (
+    Lexbuilder,
     Project,
     )
 from offspring.web.queuemanager.views import get_possibly_private_object
@@ -104,6 +105,53 @@
             status_code=200, msg_prefix=response.content)
 
 
+class BuilderListTests(TestCase):
+    view_name = 'offspring.web.queuemanager.views.builders'
+
+    def setUp(self):
+        super(BuilderListTests, self).setUp()
+        # Stub Lexbuilder.average_load because it executes some SQL that's not
+        # supported by sqlite3 and we're not interested in testing it here.
+        self.orig_load_average = Lexbuilder.average_load
+        def average_load(obj):
+            return '10'
+        Lexbuilder.average_load = property(average_load)
+
+    def tearDown(self):
+        super(BuilderListTests, self).tearDown()
+        Lexbuilder.average_load = self.orig_load_average
+
+    def test_build_details_always_shown_when_building_public_project(self):
+        builder = factory.makeLexbuilder()
+        make_user_and_login(self.client)
+        response = self.client.get(reverse(self.view_name))
+        self.assertContains(
+            response, builder.current_job.project.name, status_code=200,
+            msg_prefix=response.content)
+
+    def test_private_build_details_shown_if_user_is_allowed_to_see_it(self):
+        project = factory.makeProject(is_private=True)
+        job = factory.makeBuildResult(project=project)
+        builder = factory.makeLexbuilder(current_job=job)
+        user = project.owner
+        self.assertTrue(
+            self.client.login(username=user.username, password=user.username))
+        response = self.client.get(reverse(self.view_name))
+        self.assertContains(
+            response, builder.current_job.project.name, status_code=200,
+            msg_prefix=response.content)
+
+    def test_private_build_details_not_shown_if_user_not_allowed_to_see(self):
+        project = factory.makeProject(is_private=True)
+        job = factory.makeBuildResult(project=project)
+        builder = factory.makeLexbuilder(current_job=job)
+        make_user_and_login(self.client)
+        response = self.client.get(reverse(self.view_name))
+        self.assertNotContains(
+            response, builder.current_job.project.name, status_code=200,
+            msg_prefix=response.content)
+
+
 class BuildViewTests(TestCase):
 
     def test_public_build(self):

=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2011-10-13 22:59:59 +0000
+++ lib/offspring/web/queuemanager/views.py	2011-10-18 15:56:27 +0000
@@ -34,10 +34,6 @@
     create_object,
     update_object
 )
-from django.views.generic.list_detail import (
-    object_list,
-    object_detail
-)
 
 from pygooglechart import PieChart3D
 
@@ -56,6 +52,7 @@
     BuildRequest,
     BuildResult,
     LaunchpadProjectMilestone,
+    Lexbuilder,
     Project,
     ProjectGroup,
     Release
@@ -78,14 +75,37 @@
 #TODO: Thanks to reduced duplication, lets start using more generic views.
 
 @login_required
-def secure_object_list(request, **page_info):
-    '''Wrap object_list in login_required decorator.'''
-    return object_list(request, **page_info)
+def builders(request):
+    # builder_list is a dictionary where keys are Lexbuilder instances to be
+    # shown and the values represent whether or not the information about the
+    # builder's current job should be shown to the current user.
+    builder_list = {}
+    builders = Lexbuilder.all_objects.order_by(
+        "-is_active", "-machine_type", "-created_at")
+    for builder in builders:
+        job = builder.current_job
+        if job is not None and job.is_visible_to(request.user):
+            builder_list[builder] = True
+        else:
+            builder_list[builder] = False
+    pageData = {
+        'pillar': 'builders',
+        'builder_list': builder_list,
+        }
+    return render_to_response(
+        'queuemanager/builders.html', pageData,
+        context_instance=RequestContext(request))
 
 @login_required
-def secure_object_detail(request, **page_info):
-    '''Wrap object_detail in login_required decorator.'''
-    return object_detail(request, **page_info)
+def builder_details(request, builderName):
+    builder = Lexbuilder.objects.get(name=builderName)
+    pageData = {
+        'builder': builder,
+        'pillar': 'builders',
+        }
+    return render_to_response(
+        'queuemanager/builder_details.html', pageData,
+        context_instance=RequestContext(request))
 
 def projects(request):
     projects = Project.objects.select_related('project_group').order_by("project_group")

=== modified file 'lib/offspring/web/templates/queuemanager/builders.html'
--- lib/offspring/web/templates/queuemanager/builders.html	2011-01-22 05:41:23 +0000
+++ lib/offspring/web/templates/queuemanager/builders.html	2011-10-18 15:56:27 +0000
@@ -10,10 +10,10 @@
 	    <tr>
 	        <td width="10%"><h3>Builder</h3></td><td width="50px" align="center"><h3>Active</h3></td><td width="50px" align="center"><h3 title="If the master is unable to contact a slave, the slave is unhealthy">Health</h3></td><td align="center"><h3>Type</h3></td><td align="center"><h3>State</h3></td><td align="center" width="20%"><h3>Current Build</h3></td><td align="center" width="20%"><h3>Last Scan</h3></td><td align="right"><h3 title="The average number of hours spent each day building projects">Load</h3></td>
         </tr>
-    {% for builder in builder_list %}
+    {% for builder, build_visible in builder_list.items %}
         <tr height="20px">
             <td>
-                <a class="{% if builder.is_active %}{% if builder.is_okay %}{% ifequal builder.current_state "BUILDING" %}busy{% else %}online{% endifequal %}{% else %}problem{% endif %}{% else %}offline{% endif %}" href="{% url builder_details builder %}">{{builder.name}}</a>
+                <a class="{% if builder.is_active %}{% if builder.is_okay %}{% ifequal builder.current_state "BUILDING" %}busy{% else %}online{% endifequal %}{% else %}problem{% endif %}{% else %}offline{% endif %}" href="{% url builder_details builder.name %}">{{builder.name}}</a>
             </td>
             <td align="center">
                 <a style="margin-left: 10px;">{% if builder.is_active %}<img src="/assets/images/10.png" title="Builder Active"/>{% else %}<img src="/assets/images/12.png" title="Builder Deactivated"/>{% endif %}</a>
@@ -28,9 +28,13 @@
                 <span title="{{builder.name}} is currently {{builder.current_state}}{% ifequal builder.current_state "BUILDING" %}, estimated completion {{builder.estimated_completion}}{% endifequal %}">{{builder.current_state}}</span>
             </td>
             <td align="center"> 
-            {% if builder.current_build_projectname %}
-                <a href="{% url offspring.web.queuemanager.views.project_details builder.current_build_projectname %}">{{builder.current_build_projectname}}</a> (<a href="{{builder.current_build_projectname|link_results:builder.current_build_buildname}}">{{builder.current_build_buildname}}</a>)
-            {% endif %}    
+            {% if not build_visible %}
+              <span>Private build</span>
+            {% else %}
+              {% if builder.current_build_projectname %}
+                  <a href="{% url offspring.web.queuemanager.views.project_details builder.current_build_projectname %}">{{builder.current_build_projectname}}</a> (<a href="{{builder.current_build_projectname|link_results:builder.current_build_buildname}}">{{builder.current_build_buildname}}</a>)
+              {% endif %}    
+            {% endif %}
             </td>
             <td>
                 <span title="This field indicates the last time the master made contact with the slave.">

=== modified file 'lib/offspring/web/urls.py'
--- lib/offspring/web/urls.py	2011-10-10 14:12:28 +0000
+++ lib/offspring/web/urls.py	2011-10-18 15:56:27 +0000
@@ -17,7 +17,6 @@
 from piston.resource import Resource
 
 import offspring.web
-from offspring.web.queuemanager.models import Lexbuilder
 from offspring.web.queuemanager.handlers import (
     BuildManifestHandler,
     BuildManifestComparisonHandler,
@@ -31,8 +30,6 @@
     project_acl,
     project_create,
     project_edit,
-    secure_object_list,
-    secure_object_detail
 )
 
 admin.autodiscover()
@@ -58,19 +55,8 @@
     (r'^admin/', include(admin.site.urls)),
     (r'^openid/', include('django_openid_auth.urls')),
     (r'^logout/', 'django.contrib.auth.views.logout'),
-    (r'^builders/$', secure_object_list, {
-        'queryset' : Lexbuilder.objects.order_by("-is_active", "-machine_type", "-created_at"),
-        'template_name' : 'queuemanager/builders.html',
-        'template_object_name' : 'builder',
-        'extra_context' : { 'pillar' : 'builders', },
-    }, 'builders_list'),
-    (r'^builders/(?P<slug>[^/]+)/$', secure_object_detail, {
-        'queryset' : Lexbuilder.objects.all(),
-        'slug_field' : 'name',
-        'template_name' : 'queuemanager/builder_details.html',
-        'template_object_name' : 'builder',
-        'extra_context' : { 'pillar' : 'builders', },
-    }, 'builder_details'),
+    url(r'^builders/$', 'offspring.web.queuemanager.views.builders', name='builder_list'),
+    url(r'^builders/(?P<builderName>[^/]+)/$', 'offspring.web.queuemanager.views.builder_details', name='builder_details'),
     (r'^builders/\+api/(?P<builderName>[^/]+)/builds/$', buildresult_handler),
     (r'^builds/\+api/$', buildresult_handler),
     (r'^builds/\+api/(?P<projectName>[^/]+)/$', buildresult_handler),

=== modified file 'requirements/requirements.web.txt'
--- requirements/requirements.web.txt	2011-09-22 14:15:21 +0000
+++ requirements/requirements.web.txt	2011-10-18 15:56:27 +0000
@@ -6,7 +6,8 @@
 launchpadlib==1.6.4
 oauth==1.0.1
 python-openid>=2.2.4
-psycopg2>=2.0.6
+# Need <=2.4.1 because of https://code.djangoproject.com/ticket/16250
+psycopg2>=2.0.6,<=2.4.1
 pygooglechart>=0.2.1
 celery>=2.3.1
 django-celery>=2.3.0