Tarmac

Merge lp:~allenap/tarmac/fix-votes-copyright into lp:tarmac

  1. fix-votes-copyright
  2. Merge into main
Proposed by Gavin Panella
Status: Merged
Approved by: Paul Hummer
Approved revision: 352
Merged at revision: 352
Proposed branch: lp:~allenap/tarmac/fix-votes-copyright
Merge into: lp:tarmac
Diff against target: 56 lines (+19/-7)
2 files modified
tarmac/plugins/tests/test_votes.py (+17/-4)
tarmac/plugins/votes.py (+2/-3)
To merge this branch: bzr merge lp:~allenap/tarmac/fix-votes-copyright
Reviewer Review Type Date Requested Status
Paul Hummer Approve
Review via email: mp+34987@code.launchpad.net

Commit message

Change Copyright notices, fix small test issues.

Description of the change

Bjorn noticed that I hadn't set the copyright notice in the votes plugin (and its tests) correctly. I wrote it on work time so I've changed it to attribute copyright to Canonical. Is that okay?

I also smuggled a fix to one of the tests to use self.fail() instead of raising AssertionError, inspired from reading one of jml's recent blog posts.

To post a comment you must log in.
lp:~allenap/tarmac/fix-votes-copyright updated
352. By Gavin Panella

Merge trunk, resolving 1 conflict.

Revision history for this message
Paul Hummer (rockstar) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'tarmac/plugins/tests/test_votes.py'
--- tarmac/plugins/tests/test_votes.py 2010-09-07 20:52:17 +0000
+++ tarmac/plugins/tests/test_votes.py 2010-09-09 15:04:40 +0000
@@ -1,3 +1,18 @@
1# Copyright 2010 Canonical Ltd.
2# This file is part of Tarmac.
3#
4# Tarmac is free software: you can redistribute it and/or modify
5# it under the terms of the GNU General Public License version 3 as
6# published by the Free Software Foundation.
7#
8# Tarmac is distributed in the hope that it will be useful,
9# but WITHOUT ANY WARRANTY; without even the implied warranty of
10# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11# GNU General Public License for more details.
12#
13# You should have received a copy of the GNU General Public License
14# along with Tarmac. If not, see <http://www.gnu.org/licenses/>.
15
1"""Tests for the votes plugin."""16"""Tests for the votes plugin."""
217
3import operator18import operator
@@ -76,8 +91,7 @@
76 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),91 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
77 str(error))92 str(error))
78 else:93 else:
79 raise AssertionError(94 self.fail("Votes.run() did not raise VotingViolation.")
80 "Votes.run() did not raise VotingViolation.")
8195
82 def test_run_global_config(self):96 def test_run_global_config(self):
83 target = Thing()97 target = Thing()
@@ -103,5 +117,4 @@
103 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),117 "Got: 1 Abstain, 2 Approve, 1 Needs Information."),
104 str(error))118 str(error))
105 else:119 else:
106 raise AssertionError(120 self.fail("Votes.run() did not raise VotingViolation.")
107 "Votes.run() did not raise VotingViolation.")
108121
=== modified file 'tarmac/plugins/votes.py'
--- tarmac/plugins/votes.py 2010-09-07 20:52:17 +0000
+++ tarmac/plugins/votes.py 2010-09-09 15:04:40 +0000
@@ -1,10 +1,9 @@
1# Copyright 2009 Paul Hummer1# Copyright 2010 Canonical Ltd.
2# This file is part of Tarmac.2# This file is part of Tarmac.
3#3#
4# Tarmac is free software: you can redistribute it and/or modify4# Tarmac is free software: you can redistribute it and/or modify
5# it under the terms of the GNU General Public License version 3 as5# it under the terms of the GNU General Public License version 3 as
6# published by6# published by the Free Software Foundation.
7# the Free Software Foundation.
8#7#
9# Tarmac is distributed in the hope that it will be useful,8# Tarmac is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of9# but WITHOUT ANY WARRANTY; without even the implied warranty of

Subscribers

People subscribed via source and target branches