Merge lp:~salgado/offspring/builder-details into lp:~linaro-automation/offspring/private-builds
Proposed by
Guilherme Salgado
Status: | Merged |
---|---|
Approved by: | James Tunnicliffe |
Approved revision: | 69 |
Merged at revision: | 67 |
Proposed branch: | lp:~salgado/offspring/builder-details |
Merge into: | lp:~linaro-automation/offspring/private-builds |
Prerequisite: | lp:~salgado/offspring/builder-list |
Diff against target: |
104 lines (+31/-6) 3 files modified
lib/offspring/web/queuemanager/tests/test_views.py (+16/-4) lib/offspring/web/queuemanager/views.py (+14/-1) lib/offspring/web/templates/queuemanager/builder_details.html (+1/-1) |
To merge this branch: | bzr merge lp:~salgado/offspring/builder-details |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
James Tunnicliffe (community) | Approve | ||
Review via email: mp+79719@code.launchpad.net |
Description of the change
Update the builder_details view to omit details of the current job if the user has no rights to see it
To post a comment you must log in.
On 18 October 2011 18:25, Guilherme Salgado infrastructure) /code.launchpad .net/~salgado/ offspring/ builder- details/ +merge/ 79719 /code.launchpad .net/~salgado/ offspring/ builder- details/ +merge/ 79719 web/queuemanage r/tests/ test_views. py' web/queuemanage r/tests/ test_views. py 2011-10-18 17:24:46 +0000 web/queuemanage r/tests/ test_views. py 2011-10-18 17:24:46 +0000 s(TestCase) : web.queuemanage r.views. builders' self.view_ name)
<email address hidden> wrote:
> Guilherme Salgado has proposed merging lp:~salgado/offspring/builder-details into lp:~linaro-infrastructure/offspring/private-builds with lp:~salgado/offspring/builder-list as a prerequisite.
>
> Requested reviews:
> Linaro Infrastructure (linaro-
>
> For more details, see:
> https:/
>
> Update the builder_details view to omit details of the current job if the user has no rights to see it
> --
> https:/
> Your team Linaro Infrastructure is requested to review the proposed merge of lp:~salgado/offspring/builder-details into lp:~linaro-infrastructure/offspring/private-builds.
>
> === modified file 'lib/offspring/
> --- lib/offspring/
> +++ lib/offspring/
> @@ -106,7 +106,10 @@
>
>
> class BuilderListTest
> - view_name = 'offspring.
> + view_name = 'builder_list'
> +
> + def get_url(self, builder):
> + return reverse(
What purpose does sending builder to get_url have? I see that get_url self.view_ name)" that it
is a 1:1 replacement for the "reverse(
replaces in the tests below. Is this part way through a change?
> def setUp(self): stTests, self).setUp() details_ always_ shown_when_ building_ public_ project( self): makeLexbuilder( ) and_login( self.client) get(reverse( self.view_ name)) get(self. get_url( builder) ) ains( current_ job.project. name, status_code=200, response. content) login(username= user.username, password= user.username) ) get(reverse( self.view_ name)) get(self. get_url( builder) ) ains( current_ job.project. name, status_code=200, response. content) makeBuildResult (project= project) makeLexbuilder( current_ job=job) and_login( self.client) get(reverse( self.view_ name)) get(self. get_url( builder) ) ontains( current_ job.project. name, status_code=200, response. content)
> super(BuilderLi
> @@ -124,7 +127,7 @@
> def test_build_
> builder = factory.
> make_user_
> - response = self.client.
> + response = self.client.
> self.assertCont
> response, builder.
> msg_prefix=
> @@ -136,7 +139,7 @@
> user = project.owner
> self.assertTrue(
> self.client.
> - response = self.client.
> + response = self.client.
> self.assertCont
> response, builder.
> msg_prefix=
> @@ -146,12 +149,19 @@
> job = factory.
> builder = factory.
> make_user_
> - response = self.client.
> + response = self.client.
> self.assertNotC
> response, builder.
> msg_prefix=
<snip>
Thanks,
--
James Tunnicliffe